Android-SSD-Coders · Heba1998 · Dec 1, 2021
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,13 +10,14 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Thrifty">
         <activity
-
+            android:name=".About2"
+            android:exported="true" />
+        <activity
             android:name=".ProductView"
             android:exported="false" />
-<activity
+        <activity
             android:name=".Profile"
             android:exported="true" />
-
         <activity
             android:name=".SearchActivity"
             android:exported="false" />
@@ -27,16 +28,16 @@
             android:name=".MainActivity"
             android:exported="false" />
         <activity
-            android:name=".Splash"
+            android:name=".Signup"
             android:exported="false" />
         <activity
             android:name=".ConfirmationPage"
             android:exported="false" />
         <activity
-            android:name=".Signup"
+            android:name=".Signin"
             android:exported="false" />
         <activity
-            android:name=".Signin"
+            android:name=".Splash"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/AmplifyModelProvider.java
@@ -13,7 +13,7 @@
  */
 
 public final class AmplifyModelProvider implements ModelProvider {
-  private static final String AMPLIFY_MODEL_VERSION = "52523adac5d643063a009102021f267d";
+  private static final String AMPLIFY_MODEL_VERSION = "1c29971a13d9fcd249685dddf076b501";
   private static AmplifyModelProvider amplifyGeneratedModelInstance;
   private AmplifyModelProvider() {
 

diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/Category.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/Category.java
@@ -1,5 +1,6 @@
 package com.amplifyframework.datastore.generated.model;
 
+import com.amplifyframework.core.model.annotations.HasMany;
 import com.amplifyframework.core.model.temporal.Temporal;
 
 import java.util.List;
@@ -29,6 +30,7 @@ public final class Category implements Model {
   public static final QueryField NAME = field("Category", "name");
   private final @ModelField(targetType="ID", isRequired = true) String id;
   private final @ModelField(targetType="String", isRequired = true) String name;
+  private final @ModelField(targetType="Product") @HasMany(associatedWith = "categoryID", type = Product.class) List<Product> Products = null;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime createdAt;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime updatedAt;
   public String getId() {
@@ -39,6 +41,10 @@ public String getName() {
       return name;
   }
 
+  public List<Product> getProducts() {
+      return Products;
+  }
+
   public Temporal.DateTime getCreatedAt() {
       return createdAt;
   }

diff --git a/app/src/main/java/com/amplifyframework/datastore/generated/model/User.java b/app/src/main/java/com/amplifyframework/datastore/generated/model/User.java
@@ -1,5 +1,6 @@
 package com.amplifyframework.datastore.generated.model;
 
+import com.amplifyframework.core.model.annotations.HasMany;
 import com.amplifyframework.core.model.temporal.Temporal;
 
 import java.util.List;
@@ -29,6 +30,7 @@ public final class User implements Model {
   public static final QueryField EMAIL = field("User", "email");
   private final @ModelField(targetType="ID", isRequired = true) String id;
   private final @ModelField(targetType="String", isRequired = true) String email;
+  private final @ModelField(targetType="Favorite") @HasMany(associatedWith = "userID", type = Favorite.class) List<Favorite> Favorite = null;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime createdAt;
   private @ModelField(targetType="AWSDateTime", isReadOnly = true) Temporal.DateTime updatedAt;
   public String getId() {
@@ -39,6 +41,10 @@ public String getEmail() {
       return email;
   }
 
+  public List<Favorite> getFavorite() {
+      return Favorite;
+  }
+
   public Temporal.DateTime getCreatedAt() {
       return createdAt;
   }

diff --git a/app/src/main/java/com/example/thrifty/About1.java b/app/src/main/java/com/example/thrifty/About1.java
@@ -0,0 +1,30 @@
+package com.example.thrifty;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toolbar;
+
+public class About1 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about1);
+
+
+//        Button button1 = findViewById(R.id.Next1);
+//        button1.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Intent intent = new Intent(About1.this,MainActivity.class);
+//                startActivity(intent);
+//            }
+//        });
+   }
+
+}
diff --git a/app/src/main/java/com/example/thrifty/About2.java b/app/src/main/java/com/example/thrifty/About2.java
@@ -0,0 +1,25 @@
+package com.example.thrifty;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class About2 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about2);
+
+
+
+//        Button button2 = findViewById(R.id.Next2);
+//        button2.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Intent intent = new Intent(About1.this,MainActivity.class);
+//                startActivity(intent);
+//            }
+//        });
+    }
+}
diff --git a/app/src/main/java/com/example/thrifty/Profile.java b/app/src/main/java/com/example/thrifty/Profile.java
@@ -65,9 +65,9 @@ protected void onResume() {
             email.setText(email1);
 
         String name = sharedPreferences.getString("name", "Your email");
-        TextView name1 = findViewById(R.id.name);
+//        TextView name1 = findViewById(R.id.name);
         TextView name2 = findViewById(R.id.username);
-        name1.setText(name);
+//        name1.setText(name);
         name2.setText(name);
 
         String phone = sharedPreferences.getString("phone", "Your phone number");

diff --git a/app/src/main/res/drawable/button1.xml b/app/src/main/res/drawable/button1.xml
@@ -0,0 +1,23 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <layer-list>
+        <item android:right="5dp" android:top="5dp">
+            <shape>
+                <corners android:radius="100dp" />
+                <solid android:color="#D6D6D6" />
+            </shape>
+        </item>
+        <item android:bottom="2dp" android:left="2dp">
+            <shape>
+                <gradient android:angle="-90"
+                    android:endColor="#6C4CAC" android:startColor="#935CFF" />
+                <stroke android:width="1dp" android:color="#BABABA" />
+                <corners android:radius="4dp" />
+                <padding android:bottom="10dp" android:left="10dp"
+                    android:right="10dp" android:top="10dp" />
+            </shape>
+        </item>
+    </layer-list>
+</item>
+
+</selector>
diff --git a/app/src/main/res/drawable/edit_text_design.xml b/app/src/main/res/drawable/edit_text_design.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  res/drawable/rounded_edittext.xml -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+
+    <solid android:color="#F6F6F6" />
+    <corners
+        android:bottomRightRadius="15dp"
+        android:bottomLeftRadius="15dp"
+        android:topLeftRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>
diff --git a/app/src/main/res/drawable/edit_text_search.xml b/app/src/main/res/drawable/edit_text_search.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  res/drawable/rounded_edittext.xml -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+
+    <solid android:color="#FFFF" />
+    <corners
+        android:bottomRightRadius="15dp"
+        android:bottomLeftRadius="15dp"
+        android:topLeftRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>
diff --git a/app/src/main/res/drawable/edit_text_shadow.xml b/app/src/main/res/drawable/edit_text_shadow.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- most important is order of layers -->
+
+    <!-- Bottom right side 2dp Shadow -->
+    <item >
+        <shape android:shape="rectangle">
+            <solid android:color="#000000" />
+        </shape>
+    </item>
+
+    <!-- Bottom 2dp Shadow -->
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#000000" />
+        </shape>
+    </item>
+
+    <!-- White Top color -->
+    <item android:bottom="3px" android:right="3px">
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/envelope_filled.xml b/app/src/main/res/drawable/envelope_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="21dp"
+    android:viewportWidth="28"
+    android:viewportHeight="21">
+  <path
+      android:pathData="M11.5831,10.0939L1.0168,2.9682C2.1811,1.1902 4.2737,0 6.6316,0H21.3684C23.7263,0 25.8042,1.1761 26.9832,2.9541L16.4463,10.0659C14.9579,11.0039 13.0421,11.0039 11.5831,10.0939ZM27.9705,5.7401L18.1263,12.3761C16.8589,13.1741 15.4147,13.5659 13.9852,13.5659C12.5705,13.5659 11.1558,13.1741 9.9179,12.3901L0.0295,5.7401C0.0148,5.9221 0,6.118 0,6.3V14.7C0,18.172 2.9768,21 6.6316,21H21.3684C25.0232,21 28,18.172 28,14.7V6.3C28,6.118 27.9852,5.9221 27.9705,5.7401Z"
+      android:fillColor="#935CFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/frame.png b/app/src/main/res/drawable/frame.png
diff --git a/app/src/main/res/drawable/group_5.png b/app/src/main/res/drawable/group_5.png
diff --git a/app/src/main/res/drawable/group_8.xml b/app/src/main/res/drawable/group_8.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45dp"
+    android:height="45dp"
+    android:viewportWidth="45"
+    android:viewportHeight="45">
+  <path
+      android:pathData="M22.5,18.5m-18.5,0a18.5,18.5 0,1 1,37 0a18.5,18.5 0,1 1,-37 0"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M32.3694,17.562C31.4144,22.458 26.3954,25.8969 24.2824,27.1489C23.8864,27.3819 23.4434,27.5 23.0004,27.5C22.5574,27.5 22.1144,27.3829 21.7184,27.1489C19.6044,25.8969 14.5854,22.459 13.6304,17.562C13.2314,15.515 13.7744,13.3449 15.0834,11.7549C16.2814,10.3009 17.9464,9.5 19.7724,9.5C20.9214,9.5 22.0304,9.791 23.0004,10.344C23.9704,9.791 25.0794,9.5 26.2284,9.5C28.0544,9.5 29.7194,10.3009 30.9174,11.7549C32.2254,13.3449 32.7684,15.515 32.3694,17.562Z"
+      android:fillColor="#F07676"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_home_24.xml b/app/src/main/res/drawable/ic_baseline_home_24.xml
@@ -3,7 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="@color/dark_purple"
+    android:background="@color/purple">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>

diff --git a/app/src/main/res/drawable/ic_baseline_person_24.xml b/app/src/main/res/drawable/ic_baseline_person_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/dark_purple"
       android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_baseline_shopping_cart_24.xml b/app/src/main/res/drawable/ic_baseline_shopping_cart_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/purple"
       android:pathData="M7,18c-1.1,0 -1.99,0.9 -1.99,2S5.9,22 7,22s2,-0.9 2,-2 -0.9,-2 -2,-2zM1,2v2h2l3.6,7.59 -1.35,2.45c-0.16,0.28 -0.25,0.61 -0.25,0.96 0,1.1 0.9,2 2,2h12v-2L7.42,15c-0.14,0 -0.25,-0.11 -0.25,-0.25l0.03,-0.12 0.9,-1.63h7.45c0.75,0 1.41,-0.41 1.75,-1.03l3.58,-6.49c0.08,-0.14 0.12,-0.31 0.12,-0.48 0,-0.55 -0.45,-1 -1,-1L5.21,4l-0.94,-2L1,2zM17,18c-1.1,0 -1.99,0.9 -1.99,2s0.89,2 1.99,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.3694,10.562C20.4144,15.458 15.3954,18.8969 13.2824,20.1489C12.8864,20.3819 12.4434,20.5 12.0004,20.5C11.5574,20.5 11.1144,20.3829 10.7184,20.1489C8.6044,18.8969 3.5854,15.459 2.6304,10.562C2.2314,8.515 2.7744,6.3449 4.0834,4.7549C5.2814,3.3009 6.9464,2.5 8.7724,2.5C9.9214,2.5 11.0304,2.791 12.0004,3.344C12.9704,2.791 14.0794,2.5 15.2284,2.5C17.0544,2.5 18.7194,3.3009 19.9174,4.7549C21.2254,6.3449 21.7684,8.515 21.3694,10.562Z"
+      android:fillColor="#F07676"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search_regular.xml b/app/src/main/res/drawable/ic_search_regular.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M19.28,18.219L14.586,13.525C15.78,12.094 16.5,10.255 16.5,8.25C16.5,3.701 12.799,0 8.25,0C3.701,0 0,3.701 0,8.25C0,12.799 3.701,16.5 8.25,16.5C10.255,16.5 12.094,15.7801 13.525,14.5861L18.219,19.28C18.365,19.426 18.557,19.5 18.749,19.5C18.941,19.5 19.133,19.427 19.279,19.28C19.573,18.987 19.573,18.512 19.28,18.219ZM1.5,8.25C1.5,4.528 4.528,1.5 8.25,1.5C11.972,1.5 15,4.528 15,8.25C15,11.972 11.972,15 8.25,15C4.528,15 1.5,11.972 1.5,8.25Z"
+      android:fillColor="#41416E"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shopping_basket_regular.xml b/app/src/main/res/drawable/ic_shopping_basket_regular.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M10.6263,15.9393V19.6893C10.6263,20.2068 10.2063,20.6268 9.6888,20.6268C9.1713,20.6268 8.7513,20.2068 8.7513,19.6893V15.9393C8.7513,15.4218 9.1713,15.0018 9.6888,15.0018C10.2063,15.0018 10.6263,15.4218 10.6263,15.9393ZM14.6888,15.0018C14.1713,15.0018 13.7513,15.4218 13.7513,15.9393V19.6893C13.7513,20.2068 14.1713,20.6268 14.6888,20.6268C15.2063,20.6268 15.6263,20.2068 15.6263,19.6893V15.9393C15.6263,15.4218 15.2063,15.0018 14.6888,15.0018ZM22.435,12.7693L21.4762,20.2818C21.1787,22.6155 19.18,24.3756 16.8262,24.3756H7.5788C5.2338,24.3756 3.235,22.6217 2.9313,20.2967L1.9437,12.7693C0.7975,12.2105 0,11.0456 0,9.6881C0,7.7918 1.5412,6.2506 3.4375,6.2506H5.4075L8.8837,0.4556C9.15,0.0118 9.7263,-0.1333 10.17,0.1342C10.6138,0.4005 10.7588,0.9768 10.4913,1.4205L7.5925,6.2506H16.7813L13.8825,1.4205C13.6163,0.9768 13.76,0.4005 14.2038,0.1342C14.6463,-0.132 15.2225,0.0118 15.49,0.4556L18.9663,6.2506H20.9388C22.835,6.2506 24.3763,7.7918 24.3763,9.6881C24.3763,11.0456 23.58,12.2105 22.435,12.7693ZM20.4988,13.1268H3.8825L4.7913,20.0543C4.9738,21.4493 6.1725,22.5018 7.5788,22.5018H16.8262C18.2375,22.5018 19.4375,21.4456 19.615,20.0456L20.4988,13.1268ZM22.5013,9.6893C22.5013,8.828 21.8,8.1268 20.9388,8.1268H3.4388C2.5775,8.1268 1.8763,8.828 1.8763,9.6893C1.8763,10.5505 2.5775,11.2518 3.4388,11.2518H20.9388C21.8,11.2518 22.5013,10.5505 22.5013,9.6893Z"
+      android:fillColor="#473889"/>
+</vector>