Skip to content

Commit 0dd1378

Browse files
author
Andrew Sosa
committed
Color styling.
1 parent 39014df commit 0dd1378

14 files changed

Lines changed: 203 additions & 201 deletions

File tree

‎.idea/workspace.xml‎

Lines changed: 150 additions & 173 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mobile/src/main/java/com/hackfsu/hackfsu_android/MainActivity.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.hackfsu.hackfsu_android;
22

33
import android.content.Intent;
4+
import android.graphics.Typeface;
45
import android.os.Bundle;
56
import android.support.design.widget.NavigationView;
67
import android.support.v4.app.Fragment;
@@ -12,6 +13,7 @@
1213
import android.view.Menu;
1314
import android.view.MenuItem;
1415
import android.view.View;
16+
import android.widget.TextView;
1517

1618
public class MainActivity extends AppCompatActivity
1719
implements NavigationView.OnNavigationItemSelectedListener, Toolbar.OnMenuItemClickListener,
@@ -38,6 +40,12 @@ protected void onCreate(Bundle savedInstanceState) {
3840
} else {
3941
newFragmentTransaction(R.id.nav_live);
4042
}
43+
44+
45+
TextView navHeader = (TextView) navigationView.getHeaderView(0).findViewById(R.id.tv_navtitle);
46+
navHeader.setText("HACKFSU");
47+
navHeader.setTypeface(Typeface.createFromAsset(getAssets(), "unisans.OTF"));
48+
4149
}
4250

4351
@Override

‎mobile/src/main/java/com/hackfsu/hackfsu_android/UpdateFragment.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public void done(List<UpdateItem> list, ParseException e) {
109109
});
110110
}
111111
});
112+
mSwipeLayout.setColorSchemeResources(R.color.accent);
112113
}
113114

114115

‎mobile/src/main/res/color/nav_icon_color.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_checked="true" android:color="@color/primary" />
3+
<item android:state_checked="true" android:color="@color/primaryDark" />
44
<item android:state_checked="false" android:color="@color/grey_600"/>
55
</selector>

‎mobile/src/main/res/color/nav_text_color.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_checked="true" android:color="@color/primary" />
3+
<item android:state_checked="true" android:color="@color/primaryDark" />
44
<item android:state_checked="false" android:color="@color/primaryTextDark"/>
55
</selector>

‎mobile/src/main/res/drawable/side_nav_bar.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<shape xmlns:android="http://schemas.android.com/apk/res/android"
22
android:shape="rectangle" >
3-
<solid android:color="@color/accent"/>
3+
<solid android:color="@color/hackfsu_red"/>
44
</shape>

‎mobile/src/main/res/layout/activity_help.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919

2020
<include layout="@layout/content_help" />
2121

22-
<android.support.design.widget.FloatingActionButton android:id="@+id/fab"
23-
android:layout_width="wrap_content" android:layout_height="wrap_content"
24-
android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin"
22+
<android.support.design.widget.FloatingActionButton
23+
android:id="@+id/fab"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:layout_gravity="bottom|end"
27+
android:layout_margin="@dimen/fab_margin"
2528
android:src="@drawable/ic_send_24dp"
2629
android:tint="@color/grey_50" />
2730

‎mobile/src/main/res/layout/activity_main.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
<!--<include layout="@layout/fragment_feed_b" android:layout_width="match_parent"
1515
android:layout_height="match_parent" />-->
1616

17-
<android.support.design.widget.NavigationView android:id="@+id/nav_view"
18-
android:layout_width="wrap_content" android:layout_height="match_parent"
19-
android:layout_gravity="start" android:fitsSystemWindows="true"
17+
<android.support.design.widget.NavigationView
18+
android:id="@+id/nav_view"
19+
android:layout_width="wrap_content"
20+
android:layout_height="match_parent"
21+
android:layout_gravity="start"
22+
android:fitsSystemWindows="true"
2023
app:itemTextColor="@color/nav_text_color"
2124
app:itemIconTint="@color/nav_icon_color"
2225
app:itemBackground="@drawable/nav_bg_color"

‎mobile/src/main/res/layout/fragment_feed.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
xmlns:tools="http://schemas.android.com/tools"
2727
xmlns:app="http://schemas.android.com/apk/res-auto"
28-
tools:showIn="@layout/app_bar_main"
2928
tools:context=".MainActivity"
3029
app:layout_behavior="@string/appbar_scrolling_view_behavior"
3130
android:id="@+id/viewpager"
@@ -80,7 +79,7 @@
8079
android:layout_width="match_parent"
8180
android:layout_height="50dp"
8281
android:layout_gravity="bottom"
83-
app:tabIndicatorColor="@color/grey_white_1000"
82+
app:tabIndicatorColor="@color/grey_50"
8483
app:tabMode="fixed"/>
8584

8685
</android.support.design.widget.AppBarLayout>

‎mobile/src/main/res/layout/fragment_maps.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
android:layout_height="wrap_content"
2222
android:layout_width="match_parent"
2323
android:id="@+id/action_bar"
24+
app:elevation="2dp"
2425
android:background="@color/maps">
2526

2627

@@ -36,8 +37,6 @@
3637

3738
</android.support.v7.widget.Toolbar>
3839

39-
40-
4140
</android.support.design.widget.AppBarLayout>
4241

4342
</android.support.design.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)