versioning enabled

parvez-ahammed · Oct 6, 2022 · 54f40fb · 54f40fb
1 parent 7e15c53
commit 54f40fb
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/APK/Uni_Buddy_1.0.0.apk b/APK/Uni_Buddy_1.0.0.apk
diff --git a/app/src/main/java/com/example/homepage/MainActivity.kt b/app/src/main/java/com/example/homepage/MainActivity.kt
@@ -20,19 +20,19 @@ class MainActivity : AppCompatActivity() {
 
     //********************** For opening in the first onboarding page ************//
     private lateinit var auth: FirebaseAuth
-//    override fun onCreate(savedInstanceState: Bundle?) {
-//        super.onCreate(savedInstanceState)
-//        setContentView(R.layout.welcome)
-////        auth = Firebase.auth
-//
-//        val nextButton = findViewById<Button>(R.id.get_started)
-//        nextButton.setOnClickListener {
-//            val intent = Intent(this, OnBoarding1::class.java)
-//            startActivity(intent)
-//        }
-//
-//
-//    }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.welcome)
+//        auth = Firebase.auth
+
+        val nextButton = findViewById<Button>(R.id.get_started)
+        nextButton.setOnClickListener {
+            val intent = Intent(this, OnBoarding1::class.java)
+            startActivity(intent)
+        }
+
+
+    }
 //    public override fun onStart() {
 //        super.onStart()
 //        val currentUser = auth.currentUser
@@ -64,17 +64,17 @@ class MainActivity : AppCompatActivity() {
 
     // ********************** For opening  sign In page  page ************//
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_on_boarding3)
-
-        val nextButton = findViewById<Button>(R.id.onboarding_3_button)
-        nextButton.setOnClickListener {
-            val intent = Intent(this, SignInActivity::class.java)
-          startActivity(intent)
-
-        }
-    }
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        setContentView(R.layout.activity_on_boarding3)
+//
+//        val nextButton = findViewById<Button>(R.id.onboarding_3_button)
+//        nextButton.setOnClickListener {
+//            val intent = Intent(this, SignInActivity::class.java)
+//            startActivity(intent)
+//
+//        }
+//    }
 
 
 

diff --git a/app/src/main/java/com/example/homepage/SignUpActivity.kt b/app/src/main/java/com/example/homepage/SignUpActivity.kt
@@ -42,7 +42,7 @@ class SignUpActivity : AppCompatActivity() {
             val situation = validateData(email, password)
 
             if (situation == "OK") {
-                Toast.makeText(applicationContext, "EVERYTHING ALL RIGHT", Toast.LENGTH_SHORT)
+                Toast.makeText(applicationContext, "CHECK YOUR EMAILS SPAM BOX FOR VERIFICATION EMAIL", Toast.LENGTH_SHORT)
                     .show()
                 fireBaseSignup()
                 val intent = Intent(this, SignInActivity::class.java)

diff --git a/app/src/main/res/layout/bug_report_popup.xml b/app/src/main/res/layout/bug_report_popup.xml
@@ -6,7 +6,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
-    android:background="@color/dark_blue"
+    android:background="@drawable/rounded_list_item_view"
     android:orientation="vertical"
     android:padding="20dp">
 

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
@@ -154,6 +154,7 @@
                 android:paddingStart="10dp"
                 android:text="@string/log_out"
                 android:textColor="@color/text_black"
+                android:visibility="gone"
                 tools:ignore="RtlSymmetry" />
 
             <Button