Skip to content

Commit 4f515d6

Browse files
committed
Add hexcode readout to profile
1 parent bffcd95 commit 4f515d6

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

mobile/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626
applicationId 'com.hackfsu.android.hackfsu'
2727
minSdkVersion 19
2828
targetSdkVersion 27
29-
versionCode 13
30-
versionName '5.0.1'
29+
versionCode 14
30+
versionName '5.0.2'
3131
}
3232
buildTypes {
3333
debug {

mobile/src/main/java/com/hackfsu/android/app/fragment/ProfileFragment.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,14 @@ private void loadData(final RefreshCompleteListener callback) {
126126
preferences.getString("last_name", null));
127127

128128
mNameText.setText(fullName);
129-
129+
String hexcode = preferences.getString("hexcode", "");
130130
Set<String> groupSet = preferences.getStringSet("groups", new ArraySet<String>());
131131
if (groupSet.contains("attendee")) groupSet.remove("attendee");
132132
if (groupSet.contains("judge")) mJudgingButton.setVisibility(View.VISIBLE);
133-
String groupString = TextUtils.join(" | ", groupSet);
133+
134+
ArrayList<String> subtitleItems = new ArrayList<>(groupSet);
135+
subtitleItems.add(String.format(Locale.US, "#%s", hexcode));
136+
String groupString = TextUtils.join(" | ", subtitleItems);
134137
mGroupsText.setText(groupString);
135138

136139
mJudgingButton.setOnClickListener(new View.OnClickListener(){

mobile/src/main/res/layout/activity_login.xml

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
android:layout_height="52dp"
129129
android:layout_gravity="center"
130130
android:layout_marginBottom="12dp"
131-
android:capitalize="words"
132131
android:elevation="0dp"
133132
android:onClick="onClick"
134133
android:shadowColor="@android:color/transparent"

0 commit comments

Comments
 (0)