Merge branch 'pulsejet-design'

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/CalendarFragment.java

@@ -154,6 +154,7 @@ public class CalendarFragment extends BaseFragment {
                 EventFragment eventFragment = new EventFragment();
                 eventFragment.setArguments(bundle);
                 FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
                 ft.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
                 ft.addToBackStack(eventFragment.getTag());
                 ft.commit();

app/src/main/res/layout/app_bar_main.xml

@@ -9,7 +9,8 @@
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:theme="@style/AppTheme.AppBarOverlay"
+        app:elevation="0dp">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"

app/src/main/res/layout/blog_post_card.xml

@@ -7,8 +7,8 @@
     android:layout_marginLeft="8dp"
     android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
-    card_view:cardCornerRadius="4dp"
-    card_view:cardElevation="4dp">
+    card_view:cardCornerRadius="1dp"
+    card_view:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,8 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="#000000"
-            android:textSize="20sp"
-            android:textStyle="bold" />
+            android:textSize="22sp"
+            android:fontFamily="sans-serif-light" />
 
         <TextView
             android:id="@+id/post_published"
@@ -34,6 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:textColor="#000000" />
+            android:textColor="#000000"
+            android:textColorLink="@color/colorPrimary" />
     </LinearLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file

app/src/main/res/layout/body_card_view.xml

@@ -7,8 +7,8 @@
     android:layout_marginLeft="8dp"
     android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
-    card_view:cardCornerRadius="4dp"
-    card_view:cardElevation="4dp">
+    card_view:cardCornerRadius="1dp"
+    card_view:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/body_card_layout"

app/src/main/res/layout/feed_card.xml

@@ -7,8 +7,8 @@
     android:layout_marginLeft="8dp"
     android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
-    card_view:cardCornerRadius="4dp"
-    card_view:cardElevation="4dp">
+    card_view:cardCornerRadius="1dp"
+    card_view:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_calendar.xml

@@ -47,7 +47,7 @@
                     android:background="@drawable/round_text_box"
                     android:gravity="center"
                     android:text="# Events Today"
-                    android:textColor="@color/primaryTextColor"/>
+                    android:textColor="@color/secondaryTextColor"/>
             </RelativeLayout>
 
             <android.support.v7.widget.RecyclerView
@@ -70,6 +70,6 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:src="@android:drawable/ic_input_add"
-        android:tint="@android:color/white" />
+        android:tint="@android:color/black" />
 
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_feed.xml

@@ -25,5 +25,5 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:src="@android:drawable/ic_input_add"
-        android:tint="@android:color/white" />
+        android:tint="@android:color/black" />
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_mess_menu.xml

@@ -9,7 +9,10 @@
         android:id="@+id/hostel_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp" />
+        android:background="@color/colorPrimary"
+        android:theme="@style/AppTheme"
+        android:paddingLeft="16dp"
+        android:paddingBottom="12dp"/>
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/mess_menu_swipe_refresh_layout"
@@ -20,8 +23,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/mess_menu_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="8dp" />
+            android:layout_height="match_parent" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
 </LinearLayout>

app/src/main/res/layout/fragment_my_events.xml

@@ -11,5 +11,5 @@
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
         android:src="@android:drawable/ic_input_add"
-        android:tint="@android:color/white" />
+        android:tint="@android:color/black" />
 </RelativeLayout>

app/src/main/res/layout/hostel_spinner_item.xml

@@ -5,5 +5,5 @@
     android:layout_height="wrap_content"
     android:gravity="start"
     android:padding="4dp"
-    android:textColor="#000000"
+    android:textColor="@color/primaryTextColor"
     android:textSize="20sp" />
\ No newline at end of file

app/src/main/res/layout/mess_menu_card.xml

@@ -7,8 +7,8 @@
     android:layout_marginLeft="8dp"
     android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
-    card_view:cardCornerRadius="4dp"
-    card_view:cardElevation="4dp">
+    card_view:cardCornerRadius="1dp"
+    card_view:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/news_article_card.xml

@@ -7,8 +7,8 @@
     android:layout_marginLeft="8dp"
     android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
-    card_view:cardCornerRadius="4dp"
-    card_view:cardElevation="4dp">
+    card_view:cardCornerRadius="1dp"
+    card_view:cardElevation="1dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,16 +31,25 @@
 
             <TextView
                 android:id="@+id/article_body"
-                android:layout_marginEnd="8dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="#000000"
-                android:textStyle="bold" />
+                android:textSize="17sp"
+                android:fontFamily="sans-serif-light" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=" | "
+                android:textSize="17sp"
+                android:fontFamily="sans-serif-light" />
 
             <TextView
                 android:id="@+id/article_published"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:textSize="17sp"
+                android:fontFamily="sans-serif-light" />
         </LinearLayout>
 
         <TextView
@@ -48,6 +57,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:textColor="#000000" />
+            android:textColor="#000000"
+            android:textColorLink="@color/colorPrimary" />
     </LinearLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file

app/src/main/res/layout/role_card.xml

@@ -7,8 +7,8 @@
     android:layout_marginLeft="8dp"
     android:layout_marginRight="8dp"
     android:layout_marginTop="4dp"
-    card_view:cardCornerRadius="4dp"
-    card_view:cardElevation="4dp">
+    card_view:cardCornerRadius="1dp"
+    card_view:cardElevation="1dp">
 
     <LinearLayout
         android:id="@+id/role_card_layout"

app/src/main/res/values-v21/styles.xml

@@ -7,12 +7,9 @@
     </style>
 
     <style name="CalendarTheme" parent="@style/AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">#ecf833</item>
-        <item name="android:colorBackground">?attr/colorButtonNormal</item>
-        <item name="android:textColorPrimaryInverse">@android:color/darker_gray</item>
+        <item name="colorAccent">@color/colorSecondary</item>
+        <item name="android:textColorPrimaryInverse">@color/secondaryTextColor</item>
         <item name="android:windowBackground">?android:attr/colorButtonNormal</item>
     </style>
 

app/src/main/res/values/colors.xml

@@ -3,7 +3,7 @@
     <color name="colorPrimary">#536dfe</color>
     <color name="primaryLightColor">#8f9bff</color>
     <color name="colorPrimaryDark">#0043ca</color>
-    <color name="colorAccent">#0043ca</color>
+    <color name="colorAccent">#ffd740</color>
 
     <color name="colorSecondary">#ffd740</color>
 

app/src/main/res/values/styles.xml

@@ -17,15 +17,4 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="CalendarTheme" parent="@style/AppTheme.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:colorBackground">@android:color/darker_gray</item>
-        <item name="android:textColorPrimaryInverse">@android:color/darker_gray</item>
-        <item name="android:windowBackground">@android:color/darker_gray</item>
-    </style>
-
-
 </resources>