Merge pull request #109 from sukhbir-singh/master

modified home activity

app/src/main/AndroidManifest.xml

@@ -84,8 +84,9 @@
             android:name=".activities.SponsorActivity"
             android:label="Sponsors"
             android:parentActivityName=".activities.HomeActivity" />
-        <activity android:name=".activities.contributors">
-        </activity>
+        <activity android:name=".activities.ContributorsActivity"
+            android:label="Contributors"
+            android:parentActivityName=".activities.HomeActivity"/>
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />

app/src/main/java/com/appteamnith/hillffair/activities/ContributorsActivity.java

@@ -0,0 +1,69 @@
+package com.appteamnith.hillffair.activities;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+
+import com.appteamnith.hillffair.adapters.contributorsAdapter;
+import com.appteamnith.hillffair.R;
+import com.appteamnith.hillffair.application.SharedPref;
+import com.appteamnith.hillffair.models.contributorsItem;
+
+import java.util.ArrayList;
+
+public class ContributorsActivity extends AppCompatActivity {
+
+    RecyclerView rvContributors;
+    contributorsAdapter ContributorAdapter;
+    Toolbar tbContributers;
+    ArrayList<contributorsItem> contributorsItems;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        SharedPref pref = new SharedPref(this);
+        setTheme(pref.getThemeId());
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_contributors);
+        String BASE_URL = "https://github.com/";
+        rvContributors = (RecyclerView) findViewById(R.id.contributors_view);
+
+        contributorsItems = new ArrayList<>();
+        contributorsItems.add(new contributorsItem("Sahil Badyal", BASE_URL + "sahilbadyal.png", BASE_URL + "sahilbadyal"));
+        contributorsItems.add(new contributorsItem("Nishant Choudhary", BASE_URL + "nishant23j.png", BASE_URL + "nishant23j"));
+        contributorsItems.add(new contributorsItem("Kunal Sharma", BASE_URL + "kunal.png", BASE_URL + "kunal12422"));
+        contributorsItems.add(new contributorsItem("Shubham Naik", BASE_URL + "nrshubham.png", BASE_URL + "nrshubham"));
+        contributorsItems.add(new contributorsItem("Ashima Anand", BASE_URL + "ashima1795.png", BASE_URL + "ashima1795"));
+
+        //contributorsItems.add(new contributorsItem("", BASE_URL + ".png", BASE_URL + ""));
+
+        contributorsItems.add(new contributorsItem("Ashish Gurjar", BASE_URL + "akgurjar.png", BASE_URL + "akgurjar"));
+        contributorsItems.add(new contributorsItem("Sahil Ramola", BASE_URL + "RamolaWeb.png", BASE_URL + "RamolaWeb"));
+        contributorsItems.add(new contributorsItem("Sukhbir Singh", BASE_URL + "sukhbir-singh.png",BASE_URL + "sukhbir-singh"));
+        contributorsItems.add(new contributorsItem("Suraj", BASE_URL + "Akatsuki06.png",BASE_URL + "Akatsuki06"));
+        contributorsItems.add(new contributorsItem("Aditya Arora", BASE_URL + "adi23arora.png",BASE_URL + "adi23arora"));
+        contributorsItems.add(new contributorsItem("Goutham Reddy ", BASE_URL + "zeus512.png", BASE_URL + "zeus512"));
+        contributorsItems.add(new contributorsItem("Hemant Singh ", BASE_URL + "joshafest.png", BASE_URL + "joshafest"));
+        contributorsItems.add(new contributorsItem("Narendra Dodwaria", BASE_URL + "narendra36.png", BASE_URL + "narendra36"));
+        contributorsItems.add(new contributorsItem("Parvesh Dhull", BASE_URL + "Parveshdhull.png", BASE_URL + "Parveshdhull"));
+        contributorsItems.add(new contributorsItem("Nitin", BASE_URL + "iamNitin16.png", BASE_URL + "iamNitin16"));
+        contributorsItems.add(new contributorsItem("Anishka Gupta", BASE_URL + "Anishka0107.png", BASE_URL + "Anishka0107"));
+        contributorsItems.add(new contributorsItem("Jalaz Choudhary", BASE_URL + "jaykay12.png", BASE_URL + "jaykay12"));
+        contributorsItems.add(new contributorsItem("Jatin", BASE_URL + "Jatin0312.png", BASE_URL + "Jatin0312"));
+        contributorsItems.add(new contributorsItem("Vijaya Laxmi", BASE_URL + "vijaya22.png", BASE_URL + "vijaya22"));
+        contributorsItems.add(new contributorsItem("Vibhor Garg", BASE_URL + "vibhorg.png", BASE_URL + "vibhorg"));
+
+        ContributorAdapter = new contributorsAdapter(contributorsItems, ContributorsActivity.this);
+        rvContributors.setAdapter(ContributorAdapter);
+
+        tbContributers = (Toolbar) findViewById(R.id.contributors_toolbar);
+        tbContributers.setTitle("Contributors");
+        setSupportActionBar(tbContributers);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        LinearLayoutManager lvmanager = new LinearLayoutManager(this);
+        lvmanager.setOrientation(LinearLayoutManager.VERTICAL);
+        rvContributors.setLayoutManager(lvmanager);
+
+    }
+}

app/src/main/java/com/appteamnith/hillffair/activities/HomeActivity.java

@@ -1,7 +1,6 @@
 package com.appteamnith.hillffair.activities;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.AppBarLayout;
@@ -13,7 +12,6 @@
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
@@ -26,11 +24,9 @@
 import com.appteamnith.hillffair.adapters.HomeAdapter;
 import com.appteamnith.hillffair.application.SharedPref;
 import com.appteamnith.hillffair.models.main_screen_model;
-import com.appteamnith.hillffair.utilities.DividerItemDecoration;
 import com.appteamnith.hillffair.utilities.RecyclerItemClickListener;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 
 public class HomeActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
     private RecyclerView recyclerView;
@@ -63,6 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
         list.add(new main_screen_model(R.drawable.sponsor,"Sponsors",R.color.sponsor));
         list.add(new main_screen_model(R.drawable.core,"Core Teams",R.color.coreTeam));
         list.add(new main_screen_model(R.drawable.clubs,"Clubs",R.color.club));
+        list.add(new main_screen_model(R.drawable.contributors,"Contributors",R.color.contributors));
 
         adapter = new HomeAdapter(list, this);
         GridLayoutManager staggeredGridLayoutManager = new GridLayoutManager(this, 2);
@@ -102,6 +99,9 @@ else if(position==5){
                 else if(position==6){
                     startActivity(new Intent(HomeActivity.this, EventActivity.class));
                 }
+                else if(position==7){
+                    startActivity(new Intent(HomeActivity.this, ContributorsActivity.class));
+                }
             }
         }));
     }

app/src/main/java/com/appteamnith/hillffair/activities/SponsorActivity.java

@@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         sponsorItems = new ArrayList<>();
 
-        sponsorItems.add(new SponsorItem("skysandle.in",BASE_URL+"sponsor-22.png"));
+        sponsorItems.add(new SponsorItem("SkyCandle.in",BASE_URL+"sponsor-22.png"));
         sponsorItems.add(new SponsorItem("Board Of School Education, H.P.",BASE_URL+"sponsor-16.png"));
         sponsorItems.add(new SponsorItem("Tata Shaktee",BASE_URL+"sponsor-17.png"));
         sponsorItems.add(new SponsorItem("Cad Desk",BASE_URL+"sponsor-18.png"));

app/src/main/java/com/appteamnith/hillffair/adapters/HomeAdapter.java

@@ -55,6 +55,8 @@ else if(position==5)
             holder.cardView.setBackgroundColor(Color.rgb(255,245,157));
         else if(position==6)
             holder.cardView.setBackgroundColor(Color.rgb(248,187,208));
+        else if(position==7)
+            holder.cardView.setBackgroundColor(Color.rgb(198,193,250));
 
     }
 

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.appteamnith.hillffair.activities.contributors">
+    tools:context="com.appteamnith.hillffair.activities.ContributorsActivity">
 
     <android.support.v7.widget.Toolbar
         android:layout_width="match_parent"

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

@@ -2,23 +2,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
-    android:background="@drawable/side_nav_bar"
+    android:layout_marginTop="10dp"
+    android:background="#fff"
     android:gravity="bottom"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
     <ImageView
+        android:layout_marginTop="14dp"
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:src="@android:drawable/sym_def_app_icon" />
+        android:scaleType="centerInside"
+        android:src="@drawable/main_screen" />
 
     <TextView
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
@@ -27,10 +27,16 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/textView"
         android:textColor="#fff"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="[email protected]" />
+    <View
+        android:background="#000"
+        android:layout_marginTop="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
 
 </LinearLayout>

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

@@ -56,5 +56,6 @@
     <color name="sponsor">#FFFFCC80</color>
     <color name="about" >#FFFFF59D</color>
     <color name="battleday" >#9dffa4</color>
+    <color name="contributors" >#c6c1fa</color>
 
 </resources>