ready to roll !

RajSolai · Jul 16, 2020 · 0e69044 · 0e69044
1 parent ef38176
commit 0e69044
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 63 deletions.
diff --git a/lib/components/CustomAppBar.dart b/lib/components/CustomAppBar.dart
@@ -179,17 +179,14 @@ class _CustomAppBarState extends State<CustomAppBar> {
               width: 5,
             ),
             Container(
-              margin: EdgeInsets.only(top: 40, bottom: 0, right: 90),
+              margin: EdgeInsets.only(top: 40, bottom: 0, right: 60),
               padding: EdgeInsets.all(10),
               child: Text(
                 this.widget.title,
                 textScaleFactor: 1.0,
                 style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
               ),
             ),
-            /* SizedBox(
-              width: 80,
-            ), */
             Container(
                 margin: EdgeInsets.only(top: 40, bottom: 0),
                 child: FlatButton.icon(
@@ -199,7 +196,6 @@ class _CustomAppBarState extends State<CustomAppBar> {
                     ),
                     label: Text(
                       "Donate",
-                      style: TextStyle(fontSize: 16),
                       textScaleFactor: 1.0,
                     ),
                     onPressed: () {

diff --git a/lib/pages/addbook.dart b/lib/pages/addbook.dart
@@ -163,7 +163,7 @@ class _AddBookState extends State<AddBook> {
                 CupertinoButton(
                     child: Text("Okay"),
                     onPressed: () {
-                      Navigator.of(context).pop();
+                      Navigator.pushNamed(context, "/home");
                     }),
                 CupertinoButton(
                     child: Text("View Donations"),

diff --git a/lib/pages/register.dart b/lib/pages/register.dart
@@ -25,8 +25,6 @@ class _RegisterState extends State<Register> {
   String dp;
   String _city;
   String _state;
-  String _phoneno;
-  String _waphoneno;
   String _userInterestSchool;
   String _userInterestCollege;
   String userState;
@@ -143,9 +141,7 @@ class _RegisterState extends State<Register> {
         displayname != null &&
         _city != null &&
         _state != null &&
-        _isSchool != null &&
-        _phoneno != null &&
-        _waphoneno != null) {
+        _isSchool != null) {
       _signUp(email, pass, displayname);
     } else {
       _loginAlerts("Values Not Filled 😕",
@@ -186,8 +182,6 @@ class _RegisterState extends State<Register> {
         'dpurl': _dpImageUrl == null ? _dpDefault : _dpImageUrl,
         'city': _city.toUpperCase(),
         'state': _state.toUpperCase(),
-        'phone': _phoneno,
-        'waphone': _waphoneno,
         'grade': _isSchool ? "School" : "College",
         'userinterest': _userInterestSchool == null
             ? _userInterestCollege
@@ -301,7 +295,6 @@ class _RegisterState extends State<Register> {
                             height: 15,
                           ),
                           TextField(
-                              obscureText: true,
                               decoration: InputDecoration(
                                   border: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(10)),
@@ -324,7 +317,6 @@ class _RegisterState extends State<Register> {
                             height: 15,
                           ),
                           TextField(
-                              obscureText: true,
                               decoration: InputDecoration(
                                   border: OutlineInputBorder(
                                       borderRadius: BorderRadius.circular(10)),
@@ -337,52 +329,6 @@ class _RegisterState extends State<Register> {
                           SizedBox(
                             height: 15,
                           ),
-                          Text(
-                            "Phone Number (without +91)",
-                            textAlign: TextAlign.left,
-                            style: TextStyle(
-                                fontWeight: FontWeight.bold, fontSize: 16),
-                          ),
-                          SizedBox(
-                            height: 15,
-                          ),
-                          TextField(
-                              obscureText: true,
-                              decoration: InputDecoration(
-                                  border: OutlineInputBorder(
-                                      borderRadius: BorderRadius.circular(10)),
-                                  hintText: 'eg : 9984452254'),
-                              onChanged: (value) {
-                                setState(() {
-                                  _phoneno = value;
-                                });
-                              }),
-                          SizedBox(
-                            height: 15,
-                          ),
-                          Text(
-                            "WhatsApp Number (without +91)",
-                            textAlign: TextAlign.left,
-                            style: TextStyle(
-                                fontWeight: FontWeight.bold, fontSize: 16),
-                          ),
-                          SizedBox(
-                            height: 15,
-                          ),
-                          TextField(
-                              obscureText: true,
-                              decoration: InputDecoration(
-                                  border: OutlineInputBorder(
-                                      borderRadius: BorderRadius.circular(10)),
-                                  hintText: 'eg : 9984452254'),
-                              onChanged: (value) {
-                                setState(() {
-                                  _waphoneno = value;
-                                });
-                              }),
-                          SizedBox(
-                            height: 15,
-                          ),
                           Container(
                             child: ListTile(
                               title: Text("Are you a School Student ?"),

diff --git a/lib/services/chat/sendmessage.dart b/lib/services/chat/sendmessage.dart
@@ -294,9 +294,17 @@ class _SendMessageState extends State<SendMessage> {
                       child: TextField(
                           controller: _messageCtrl,
                           decoration: InputDecoration(
+                              filled: true,
                               border: OutlineInputBorder(
-                                  borderRadius: BorderRadius.circular(10)),
-                              hintText: "Type in Your Message"),
+                                borderSide: BorderSide.none,
+                                borderRadius: BorderRadius.circular(20),
+                              ),
+                              contentPadding: EdgeInsets.only(
+                                  left: 15, bottom: 11, top: 11, right: 15),
+                              fillColor: brightness == Brightness.dark
+                                  ? Color(0xFF666a6d)
+                                  : Color(0xFFd8dcd6),
+                              hintText: "Enter your Message"),
                           onChanged: (value) {
                             setState(() {
                               _message = value;