fixed few bugs and ui

Maniii97 · Jul 18, 2023 · cfd3450 · cfd3450
1 parent cbc08cd
commit cfd3450
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/app/src/main/java/com/example/attendancecalculator/ResultDialog.kt b/app/src/main/java/com/example/attendancecalculator/ResultDialog.kt
@@ -29,24 +29,22 @@ class ResultDialog : AppCompatActivity() {
 
 
 
-        if (bunk > 0) {
+        if (bunk > 0 && required==0) {
             setContentView(R.layout.result_dialog0)
-        }
-        else if (required in 6..11) {
+        } else if (required in 6..11) {
             setContentView(R.layout.result_dialog1)
         } else if (required in 12..17) {
             setContentView(R.layout.result_dialog2)
         } else if (required > 17) {
             setContentView(R.layout.result_dialog3)
-        } else if(required in 0..6) {
+        } else  {
             setContentView(R.layout.activity_result_dialog)
 
         }
 
         var result: String = ""
 
 
-
         if (required == 0) {
             result =
                     "You already have 75% attendance. \n" +
@@ -64,10 +62,9 @@ class ResultDialog : AppCompatActivity() {
         else{
             result ="You need to attend $required more classes to attain 75% attendance \n" +
                     "Current Attendance : $presentc/$totalc = $cAttn% \n" +
-                    "Required Attendance : $req/$total = $nAttn% \n"
+                    "Required Attendance : $req/$total = $nAttn%"
         }
 
-
         val tvResult = findViewById<TextView>(R.id.tvResult)
         tvResult.text=result
 

diff --git a/app/src/main/res/drawable/mrii.gif b/app/src/main/res/drawable/mrii.gif
diff --git a/app/src/main/res/layout/result_dialog1.xml b/app/src/main/res/layout/result_dialog1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -64,4 +64,4 @@
 
 
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/result_dialog2.xml b/app/src/main/res/layout/result_dialog2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -64,4 +64,4 @@
 
 
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/result_dialog3.xml b/app/src/main/res/layout/result_dialog3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -34,11 +34,14 @@
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/mri4"
-                android:layout_gravity="center" />
+            <pl.droidsonroids.gif.GifImageView
+                android:layout_width="225dp"
+                android:layout_height="225dp"
+                android:layout_gravity="center"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/mrii" />
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btnCalculate"
@@ -64,4 +67,4 @@
 
 
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -8,4 +8,5 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="blue">#7584fa</color>
+    <color name="whitee">#756a6a</color>
 </resources>