Skip to content

Commit 2b81cb2

Browse files
committed
Merge pull request #139 from pennlabs/registrar-no-prof
Fix registrar details when no instructor provided
2 parents c4ba108 + 4621cf4 commit 2b81cb2

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

PennMobile/src/main/java/com/pennapps/labs/pennmobile/RegistrarFragment.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,11 @@ protected Boolean doInBackground(Void... voids) {
129129
activityText = course.activity;
130130
locationText = courseCodeText + " - " + course.meetings.get(0).building_code + " " + course.meetings.get(0).room_number;
131131
courseTitleText = course.course_title;
132-
instructorsText = course.instructors.get(0).name;
132+
try {
133+
instructorsText = course.instructors.get(0).name;
134+
} catch (IndexOutOfBoundsException e) {
135+
instructorsText = getString(R.string.professor_missing);
136+
}
133137
courseDescription = course.course_description;
134138
return true;
135139
} catch (Exception ignored) {
@@ -140,7 +144,7 @@ protected Boolean doInBackground(Void... voids) {
140144
@Override
141145
protected void onPostExecute(Boolean valid) {
142146
if (!valid || courses.size() == 0) {
143-
courseCodeTextView.setText(input);
147+
courseCodeTextView.setText(courseCodeText);
144148
courseTitleTextView.setText(input + " is not currently offered.");
145149
return;
146150
}
@@ -157,6 +161,9 @@ protected void onPostExecute(Boolean valid) {
157161
courseActivityTextView.setText(activityText);
158162
courseTitleTextView.setText(courseTitleText);
159163
instructorTextView.setText(instructorsText);
164+
if (instructorsText.equals(getString(R.string.professor_missing))) {
165+
instructorTextView.setTextColor(getResources().getColor(R.color.color_primary_light));
166+
}
160167

161168
if (courseDescription.equals("")) {
162169
descriptionTitle.setVisibility(View.GONE);

PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/RegistrarAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
4545
try {
4646
courseInstr.setText(course.instructors.get(0).name);
4747
} catch (IndexOutOfBoundsException e) {
48-
courseInstr.setText("No professor listed");
48+
courseInstr.setText(getContext().getString(R.string.professor_missing));
4949
courseInstr.setTextColor(Color.parseColor("#4a000000"));
5050
}
5151
courseTitle.setText(course.course_title);

PennMobile/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
<string name="course">Course</string>
3434
<string name="instructor">Instructor</string>
3535
<string name="difficulty">Difficulty</string>
36+
<string name="professor_missing">No professor listed</string>
3637

3738
</resources>

0 commit comments

Comments
 (0)