diff --git a/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt index 2cbf4b5..4a940c2 100644 --- a/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt +++ b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt @@ -33,6 +33,7 @@ class NgoSignup2Fragment : Fragment() { private var officeAdd: String? = "" private var orgPin: String? = "" private var orgPass: String? = "" + private var category: String? = "" private lateinit var registerAuth: FirebaseAuth @@ -58,7 +59,6 @@ class NgoSignup2Fragment : Fragment() { v?.findViewById(R.id.ngosignup_select_orgtype_items) autoCompleteTV?.setAdapter(arrayAdapter) - registerAuth = Firebase.auth orgName = arguments?.getString("Name").toString().trim() @@ -70,16 +70,14 @@ class NgoSignup2Fragment : Fragment() { autoCompleteTV?.setOnClickListener { category = autoCompleteTV.text.toString() - if (category != "") { - if (category == "Others") { - tilCategoryOthers?.visibility = View.VISIBLE - etCategoryOthers?.setOnClickListener { - category = etCategoryOthers?.text.toString() - } - } else { - category = autoCompleteTV.text.toString().trim() - tilCategoryOthers?.visibility = View.GONE + if (category == "Others") { + tilCategoryOthers?.visibility = View.VISIBLE + etCategoryOthers?.setOnClickListener { + category = etCategoryOthers?.text.toString() } + } else { + tilCategoryOthers?.visibility = View.GONE + category = autoCompleteTV.text.toString().trim() } } @@ -113,6 +111,7 @@ class NgoSignup2Fragment : Fragment() { ngoInfo["PhoneNumber"] = orgPhone!! ngoInfo["Address"] = officeAdd!! ngoInfo["Pin Code"] = orgPin!! + ngoInfo["Category"] = category!! ngoInfo["isDonor"] = "0" // add the value of the org type from the dropdown and upload document diff --git a/app/src/main/res/drawable/bags.png b/app/src/main/res/drawable/bags.png new file mode 100644 index 0000000..37602a5 Binary files /dev/null and b/app/src/main/res/drawable/bags.png differ diff --git a/app/src/main/res/drawable/books.png b/app/src/main/res/drawable/books.png new file mode 100644 index 0000000..8b2a507 Binary files /dev/null and b/app/src/main/res/drawable/books.png differ diff --git a/app/src/main/res/drawable/clothing.png b/app/src/main/res/drawable/clothing.png new file mode 100644 index 0000000..2563a48 Binary files /dev/null and b/app/src/main/res/drawable/clothing.png differ diff --git a/app/src/main/res/drawable/financial.png b/app/src/main/res/drawable/financial.png new file mode 100644 index 0000000..bea2b64 Binary files /dev/null and b/app/src/main/res/drawable/financial.png differ diff --git a/app/src/main/res/drawable/food.png b/app/src/main/res/drawable/food.png new file mode 100644 index 0000000..f2dabc7 Binary files /dev/null and b/app/src/main/res/drawable/food.png differ diff --git a/app/src/main/res/drawable/ic_baseline_perm_identity_24.xml b/app/src/main/res/drawable/ic_baseline_perm_identity_24.xml deleted file mode 100644 index 0c04292..0000000 --- a/app/src/main/res/drawable/ic_baseline_perm_identity_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/kitchen_wares.png b/app/src/main/res/drawable/kitchen_wares.png new file mode 100644 index 0000000..81b81ba Binary files /dev/null and b/app/src/main/res/drawable/kitchen_wares.png differ diff --git a/app/src/main/res/drawable/shoes.png b/app/src/main/res/drawable/shoes.png new file mode 100644 index 0000000..b5bff48 Binary files /dev/null and b/app/src/main/res/drawable/shoes.png differ diff --git a/app/src/main/res/drawable/stationeries.png b/app/src/main/res/drawable/stationeries.png new file mode 100644 index 0000000..644447c Binary files /dev/null and b/app/src/main/res/drawable/stationeries.png differ diff --git a/app/src/main/res/drawable/toys.png b/app/src/main/res/drawable/toys.png new file mode 100644 index 0000000..fdc1c18 Binary files /dev/null and b/app/src/main/res/drawable/toys.png differ diff --git a/app/src/main/res/layout/user_dashboard_fragment.xml b/app/src/main/res/layout/user_dashboard_fragment.xml index b334525..0f6284f 100644 --- a/app/src/main/res/layout/user_dashboard_fragment.xml +++ b/app/src/main/res/layout/user_dashboard_fragment.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginTop="10dp" android:background="@color/theme_background"> + android:layout_height="wrap_content"> + android:textSize="30sp" /> @@ -75,7 +74,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight=".5" - android:fontFamily="@font/righteous" + android:fontFamily="@font/roboto_bold" android:gravity="center" android:text="@string/view_more" android:textColor="@color/theme_text_color_body" @@ -89,75 +88,99 @@ + android:layout_height="70dp" + android:src="@drawable/clothing" /> + + + android:layout_height="70dp" + android:src="@drawable/kitchen_wares" /> + + android:layout_height="70dp" + android:src="@drawable/toys" /> + + android:layout_height="70dp" + android:src="@drawable/stationeries" /> + - + android:layout_height="70dp" + android:src="@drawable/shoes" /> + + android:layout_height="70dp" + android:src="@drawable/books" /> + + android:layout_height="70dp" + android:src="@drawable/food" /> + + + android:layout_height="70dp" + android:src="@drawable/bags" /> + +