Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ proguard/
captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
Expand All @@ -66,7 +65,6 @@ captures/
#*.keystore

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/

# Google Services (e.g. APIs or Firebase)
Expand All @@ -92,8 +90,5 @@ lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
app/google-services.json
.idea/codeStyles/Project.xml
.idea/codeStyles/Project.xml
app/release/output.json
56 changes: 30 additions & 26 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
apply plugin: 'com.google.devtools.ksp'
Expand All @@ -8,40 +9,43 @@ apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'com.google.gms.google-services'

android {
compileSdk 37
compileSdk = 37
defaultConfig {
applicationId "com.cornellappdev.coursegrab"
minSdkVersion 24
targetSdkVersion 34
versionCode 10
versionName "1.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
applicationId = "com.cornellappdev.coursegrab"
minSdk = 24
targetSdk = 34
versionCode = 10
versionName = "1.2.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
buildConfigField("String", "BACKEND_URI", "\"coursegrab-backend.cornellappdev.com\"")
}
buildTypes {
debug {
manifestPlaceholders = [crashlyticsCollectionEnabled: "false"]
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
minifyEnabled = false
proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro')
}
release {
manifestPlaceholders = [crashlyticsCollectionEnabled: "true"]
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
minifyEnabled = false
proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro')
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '11'
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
buildFeatures {
viewBinding true
buildConfig true
viewBinding = true
buildConfig = true
}
namespace = 'com.cornellappdev.coursegrab'
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_17
}
namespace 'com.cornellappdev.coursegrab'
}

dependencies {
Expand All @@ -57,18 +61,18 @@ dependencies {
implementation 'androidx.credentials:credentials-play-services-auth:1.6.0'
implementation 'com.google.android.libraries.identity.googleid:googleid:1.2.0'
implementation 'com.squareup.okhttp3:okhttp:5.5.0'
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofit_version"
implementation "com.squareup.retrofit2:retrofit:${rootProject.ext.retrofit_version}"
implementation "com.squareup.retrofit2:converter-kotlinx-serialization:${rootProject.ext.retrofit_version}"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.11.0'
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_json_version"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:${rootProject.ext.serialization_json_version}"
implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.core:core-ktx:1.19.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.11.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.11.0'
implementation 'androidx.activity:activity-ktx:1.8.0'
implementation "com.google.dagger:hilt-android:$hilt_version"
ksp "com.google.dagger:hilt-compiler:$hilt_version"
implementation 'androidx.activity:activity-ktx:1.13.0'
implementation "com.google.dagger:hilt-android:${rootProject.ext.hilt_version}"
ksp "com.google.dagger:hilt-compiler:${rootProject.ext.hilt_version}"
implementation 'androidx.constraintlayout:constraintlayout:2.2.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
testImplementation 'junit:junit:4.13.2'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<activity
android:name=".ui.login.LoginActivity"
android:exported="true"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"></activity>
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity
android:name=".ui.main.MainActivity"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ class CourseDetailsActivity : AppCompatActivity() {

val courseDetails: SearchResult = intent.getParcelableExtra<SearchResult>("courseDetails") as SearchResult

binding.headerTextView.text = "${courseDetails.subjectCode} ${courseDetails.courseNum}"
binding.headerTextView.text = getString(
R.string.course_header_format,
courseDetails.subjectCode,
courseDetails.courseNum
)

binding.courseTitle.text = courseDetails.title
binding.courseDetails.text =
Expand Down Expand Up @@ -91,7 +95,11 @@ class CourseDetailsActivity : AppCompatActivity() {
holder.sectionStatus.setImageResource(if (availableCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)

//change tracking text
holder.trackText.text = availableCourses[position].numTracking.toString() + " Tracking"
holder.trackText.text = context.resources.getQuantityString(
R.plurals.tracking_count,
availableCourses[position].numTracking,
availableCourses[position].numTracking
)

//Change the track button to remove button
holder.removeButton.visibility =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ class MainActivity : AppCompatActivity() {
layoutManager = LinearLayoutManager(this@MainActivity)
adapter = AvailableAdapter(state.available, this@MainActivity)
}
binding.availableTitle.text = "${state.available.size} Available"
binding.availableTitle.text = getString(R.string.available_count, state.available.size)

binding.awaitingList.apply {
layoutManager = LinearLayoutManager(this@MainActivity)
adapter = AwaitingAdapter(state.awaiting, this@MainActivity)
}
binding.awaitingTitle.text = "${state.awaiting.size} Awaiting"
binding.awaitingTitle.text = getString(R.string.awaiting_count, state.awaiting.size)

binding.layoutAvailable.visibility =
if (state.available.isNotEmpty()) View.VISIBLE else View.GONE
Expand Down Expand Up @@ -209,8 +209,12 @@ class MainActivity : AppCompatActivity() {
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.courseTitle.text =
"${availableCourses[position].subjectCode} ${availableCourses[position].courseNum}: ${availableCourses[position].title}"
holder.courseTitle.text = context.getString(
R.string.course_title_format,
availableCourses[position].subjectCode,
availableCourses[position].courseNum,
availableCourses[position].title
)
holder.courseTime.text = availableCourses[position].section.uppercase(getDefault())
holder.coursePin.text = availableCourses[position].catalogNum.toString()
holder.courseStatus.setImageResource(if (availableCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
Expand Down Expand Up @@ -260,8 +264,12 @@ class MainActivity : AppCompatActivity() {
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.courseTitle.text =
"${awaitingCourses[position].subjectCode} ${awaitingCourses[position].courseNum}: ${awaitingCourses[position].title}"
holder.courseTitle.text = context.getString(
R.string.course_title_format,
awaitingCourses[position].subjectCode,
awaitingCourses[position].courseNum,
awaitingCourses[position].title
)
holder.courseTime.text = awaitingCourses[position].section.uppercase(getDefault())
holder.coursePin.text = awaitingCourses[position].catalogNum.toString()
holder.courseStatus.setImageResource(if (awaitingCourses[position].isOpen) R.drawable.ic_status_open else R.drawable.ic_status_closed)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.cornellappdev.coursegrab.ui.notification

import android.content.Intent
import android.net.Uri
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.core.net.toUri
import com.cornellappdev.coursegrab.R
import com.cornellappdev.coursegrab.databinding.ActivityNotificationModalBinding
import com.cornellappdev.coursegrab.models.Course
import com.cornellappdev.coursegrab.models.CourseNotification
Expand All @@ -22,13 +23,18 @@ class NotificationModal : AppCompatActivity() {
val course: Course =
(intent.getParcelableExtra<CourseNotification>("courseDetails") as CourseNotification).section

binding.courseTitle.text = "${course.subjectCode} ${course.courseNum}: ${course.title}"
binding.courseTitle.text = getString(
R.string.course_title_format,
course.subjectCode,
course.courseNum,
course.title
)
binding.courseSection.text = course.section
binding.coursePin.text = course.catalogNum.toString()

binding.buttonStudentCenter.setOnClickListener {
val browserIntent =
Intent(Intent.ACTION_VIEW, Uri.parse("http://studentcenter.cornell.edu"))
Intent(Intent.ACTION_VIEW, "http://studentcenter.cornell.edu".toUri())
startActivity(browserIntent)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,12 @@ class SearchActivity : AppCompatActivity() {
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.courseTitle.text =
"${resultsCourses[position].subjectCode} ${resultsCourses[position].courseNum}: ${resultsCourses[position].title}"
holder.courseTitle.text = context.getString(
R.string.course_title_format,
resultsCourses[position].subjectCode,
resultsCourses[position].courseNum,
resultsCourses[position].title
)

holder.expandButton.setOnClickListener {
val intent = Intent(context, CourseDetailsActivity::class.java).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.view.View
import android.view.WindowInsets
import android.widget.VideoView
import androidx.appcompat.app.AppCompatActivity
import androidx.core.net.toUri
import com.cornellappdev.coursegrab.R
import com.cornellappdev.coursegrab.databinding.ActivitySplashScreenBinding
import com.cornellappdev.coursegrab.ui.login.LoginActivity
Expand Down Expand Up @@ -74,10 +75,8 @@ class SplashScreenActivity : AppCompatActivity() {
fullscreenContent = binding.fullscreenContent
fullscreenContent.setOnClickListener { toggle() }
try {
val video: Uri = Uri.parse(
"android.resource://" + packageName + "/"
+ R.raw.splash
)
val video: Uri = ("android.resource://" + packageName + "/"
+ R.raw.splash).toUri()
fullscreenContent.visibility = View.VISIBLE
fullscreenContent.setVideoURI(video)
fullscreenContent.setOnCompletionListener { jump() }
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_course_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
android:maxLines="2"
android:paddingStart="14dp"
android:scrollHorizontally="true"
android:text="CS 1998: Intro to Android"
tools:text="CS 1998: Intro to Android"
android:textColor="@android:color/black"
android:textSize="18sp" />

Expand All @@ -82,7 +82,7 @@
android:fontFamily="sans-serif-medium"
android:gravity="bottom"
android:paddingLeft="14dp"
android:text="LEC 006 / M 7:30PM"
tools:text="LEC 006 / M 7:30PM"
android:textSize="16sp" />

</LinearLayout>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingBottom="4dp"
android:text="0 Available"
tools:text="0 Available"
android:textColor="@color/greenTextColor"
android:textSize="20sp" />

Expand Down Expand Up @@ -115,7 +115,7 @@
android:paddingStart="16dp"
android:paddingTop="16dp"
android:paddingBottom="4dp"
android:text="0 Awaiting"
tools:text="0 Awaiting"
android:textColor="@android:color/black"
android:textSize="20sp" />

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_notification_modal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
android:layout_marginStart="20dp"
android:layout_marginTop="45dp"
android:layout_marginEnd="20dp"
android:text="CS 1998: Intro to Android Development"
tools:text="CS 1998: Intro to Android Development"
android:textAlignment="center"
android:textAllCaps="false"
android:textColor="@color/white"
Expand All @@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:text="10032"
tools:text="10032"
android:textAlignment="center"
android:textAllCaps="false"
android:textColor="@color/white"
Expand All @@ -64,7 +64,7 @@
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:fontFamily="sans-serif-medium"
android:text="lec 001 / TR 1:25pm"
tools:text="lec 001 / TR 1:25pm"
android:textAlignment="center"
android:textAllCaps="true"
android:textColor="@color/white"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_search.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
android:paddingStart="14dp"
android:paddingTop="16dp"
android:paddingBottom="10dp"
android:text="0 Results"
tools:text="0 Results"
android:textColor="@color/black"
android:textSize="24sp" />

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/course_available_list_item.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -25,7 +26,7 @@
android:maxLines="2"
android:paddingStart="16dp"
android:scrollHorizontally="true"
android:text="CS 1998: Intro to Android"
tools:text="CS 1998: Intro to Android"
android:textColor="@android:color/black"
android:textSize="18sp" />

Expand Down Expand Up @@ -57,7 +58,7 @@
android:fontFamily="sans-serif-medium"
android:gravity="bottom"
android:paddingStart="14dp"
android:text="LEC 006 / M 7:30PM"
tools:text="LEC 006 / M 7:30PM"
android:textSize="16sp" />

<TextView
Expand All @@ -68,7 +69,7 @@
android:fontFamily="sans-serif-medium"
android:gravity="bottom|end"
android:paddingRight="16dp"
android:text="10032"
tools:text="10032"
android:textSize="16sp" />
</LinearLayout>

Expand Down
Loading