fixed ktlint issues

HackIllinois · Feb 16, 2025 · f6be821 · f6be821
1 parent b8d7f45
commit f6be821
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 22 deletions.
diff --git a/app/src/main/java/org/hackillinois/android/API.kt b/app/src/main/java/org/hackillinois/android/API.kt
@@ -70,7 +70,7 @@ interface API {
     suspend fun buyShopItem(@Body body: ItemInstance): ShopItem
 
     @POST("shop/cart/redeem/")
-    suspend fun redeemCart(@Body body: QRCode) : Cart
+    suspend fun redeemCart(@Body body: QRCode): Cart
 
     // STAFF
 

diff --git a/app/src/main/java/org/hackillinois/android/database/entity/Cart.kt b/app/src/main/java/org/hackillinois/android/database/entity/Cart.kt
@@ -7,4 +7,4 @@ import androidx.room.PrimaryKey
 data class Cart(
     @PrimaryKey val userId: String,
     val items: Map<String, Int> // Maps itemId to quantity
-)
+)
diff --git a/app/src/main/java/org/hackillinois/android/model/scanner/QRCode.kt b/app/src/main/java/org/hackillinois/android/model/scanner/QRCode.kt
@@ -1,3 +1,3 @@
 package org.hackillinois.android.model.scanner
 
-data class QRCode(val QRCode: String)
+data class QRCode(val QRCode: String)
diff --git a/app/src/main/java/org/hackillinois/android/view/SplashScreenActivity.kt b/app/src/main/java/org/hackillinois/android/view/SplashScreenActivity.kt
@@ -37,7 +37,7 @@ class SplashScreenActivity : AppCompatActivity() {
     private var needsToUpdate = false
     private var hasInternet = true
     private var hasClickedOrAnimFinish = false
-    private lateinit var splashBackground : ImageView
+    private lateinit var splashBackground: ImageView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/org/hackillinois/android/view/home/HomeFragment.kt b/app/src/main/java/org/hackillinois/android/view/home/HomeFragment.kt
@@ -8,10 +8,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import org.hackillinois.android.R
 import org.hackillinois.android.common.TimeInfo
+import org.hackillinois.android.R
 import org.hackillinois.android.viewmodel.HomeViewModel
-import androidx.core.view.WindowCompat
 
 class HomeFragment : Fragment(), CountdownManager.CountDownListener, EventProgressManager.CountDownListener {
 

diff --git a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
@@ -160,7 +160,7 @@ class ProfileFragment : Fragment() {
         if (qrCodeImage.width > 0 && qrCodeImage.height > 0) {
             // Retrieves qr code user info that will be encoded
             val text = qr.qrInfo
-            Log.d("Attendee QR Code: ", ""+text)
+            Log.d("Attendee QR Code: ", "" + text)
             // Creates bitmap of text
             val bitmap = generateQR(text)
             // actually setting the qr code to be the generated qr code

diff --git a/app/src/main/java/org/hackillinois/android/view/scanner/AttendeeScannerFragment.kt b/app/src/main/java/org/hackillinois/android/view/scanner/AttendeeScannerFragment.kt
@@ -40,9 +40,6 @@ class AttendeeScannerFragment : Fragment() {
             val scannerFragment = ScannerFragment.newInstance("mentor-check-in")
             (context as MainActivity).switchFragment(scannerFragment, true)
         }
-
-
-
         return view
     }
 }
diff --git a/app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt b/app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt
@@ -33,9 +33,9 @@ import org.hackillinois.android.database.entity.Event
 import org.hackillinois.android.database.entity.Roles
 import org.hackillinois.android.model.scanner.EventId
 import org.hackillinois.android.model.scanner.MentorId
+import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.scanner.ScanStatus
 import org.hackillinois.android.model.scanner.UserEventPair
-import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.shop.ItemInstance
 import org.hackillinois.android.viewmodel.ScannerViewModel
 

diff --git a/...c/main/java/org/hackillinois/android/view/scanner/buttons/ModerateOrangeAnimatedButton.kt b/...c/main/java/org/hackillinois/android/view/scanner/buttons/ModerateOrangeAnimatedButton.kt
@@ -5,7 +5,7 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import org.hackillinois.android.R
 
-class PinkAnimatedButton : androidx.appcompat.widget.AppCompatButton {
+class ModerateOrangeAnimatedButton : androidx.appcompat.widget.AppCompatButton {
     constructor(context: Context?) : super(context!!) {}
     constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) {}
     constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context!!, attrs, defStyle) {

diff --git a/app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt b/app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt
@@ -2,20 +2,21 @@ package org.hackillinois.android.viewmodel
 
 import android.util.Log
 import androidx.lifecycle.*
+import kotlin.Exception
 import kotlinx.coroutines.launch
 import org.hackillinois.android.App
 import org.hackillinois.android.database.entity.*
 import org.hackillinois.android.model.event.EventsList
 import org.hackillinois.android.model.scanner.EventId
 import org.hackillinois.android.model.scanner.MentorId
+import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.scanner.ScanStatus
 import org.hackillinois.android.model.scanner.UserEventPair
-import org.hackillinois.android.model.scanner.QRCode
 import org.hackillinois.android.model.shop.ItemInstance
 import org.hackillinois.android.repository.rolesRepository
 import org.json.JSONObject
 import retrofit2.HttpException
-import kotlin.Exception
+
 
 class ScannerViewModel : ViewModel() {
     var lastScanStatus: MutableLiveData<ScanStatus> = MutableLiveData()
@@ -47,12 +48,11 @@ class ScannerViewModel : ViewModel() {
                 Log.e("STAFF MEETING ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
-
             }
         }
     }
 
-    fun redeemAttendeeCart(body : QRCode) {
+    fun redeemAttendeeCart(body: QRCode) {
         viewModelScope.launch {
             try {
                 App.getAPI().redeemCart(body)
@@ -70,7 +70,6 @@ class ScannerViewModel : ViewModel() {
                 Log.e("Failed to redeem cart", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
-
             }
         }
     }
@@ -95,7 +94,6 @@ class ScannerViewModel : ViewModel() {
                 Log.e("CHECK IN ATTENDEE ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
-
             }
         }
     }
@@ -118,7 +116,6 @@ class ScannerViewModel : ViewModel() {
                 Log.e("CHECK IN EVENT ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
-
             }
         }
     }
@@ -141,7 +138,6 @@ class ScannerViewModel : ViewModel() {
                 Log.e("CHECK IN MENTOR ERROR", error)
                 val scanStatus = ScanStatus("Scan failed: $error", false)
                 lastScanStatus.postValue(scanStatus)
-
             }
         }
     }

diff --git a/app/src/main/res/layout/fragment_attendee_scanner.xml b/app/src/main/res/layout/fragment_attendee_scanner.xml
@@ -33,7 +33,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/guidelineTop" />
 
-    <org.hackillinois.android.view.scanner.buttons.PinkAnimatedButton
+    <org.hackillinois.android.view.scanner.buttons.ModerateOrangeAnimatedButton
         android:id="@+id/eventCheckInBtn"
         android:layout_width="0dp"
         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/fragment_staff_scanner.xml b/app/src/main/res/layout/fragment_staff_scanner.xml
@@ -33,7 +33,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/guidelineTop" />
 
-    <org.hackillinois.android.view.scanner.buttons.PinkAnimatedButton
+    <org.hackillinois.android.view.scanner.buttons.ModerateOrangeAnimatedButton
         android:id="@+id/staffMeetingBtn"
         android:layout_width="0dp"
         android:layout_height="wrap_content"