Merge pull request #124 from RamolaWeb/master

Modified Layout

app/src/main/java/appteam/nith/hillffair/activities/ClubActivity.java

@@ -14,17 +14,17 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.gson.annotations.SerializedName;
+
 import appteam.nith.hillffair.R;
 import appteam.nith.hillffair.application.MyApplication;
 import appteam.nith.hillffair.application.SharedPref;
 import appteam.nith.hillffair.models.BattleEventResponse;
 import appteam.nith.hillffair.models.ClubModel;
 import appteam.nith.hillffair.models.ClubModel2;
 import appteam.nith.hillffair.utilities.Utils;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.google.gson.annotations.SerializedName;
-
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -95,7 +95,7 @@ public void onResponse(Call<ClubModel2> call, Response<ClubModel2> response) {
                         ClubModel clubdata=data.getProfile();
                         clubName.setText(clubdata.getName());
                         description.setText(clubdata.getDescription());
-                        Glide.with(ClubActivity.this).load(clubdata.getPhoto()).diskCacheStrategy(DiskCacheStrategy.ALL).error(R.drawable.person_icon).into(grup_img);
+                        Glide.with(MyApplication.getAppContext()).load(clubdata.getPhoto()).diskCacheStrategy(DiskCacheStrategy.ALL).error(R.drawable.person_icon).into(grup_img);
                     }
                     else {
                         progressBar.setVisibility(View.INVISIBLE);

app/src/main/java/appteam/nith/hillffair/activities/CoreTeamActivity.java

@@ -6,13 +6,13 @@
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 
+import java.util.ArrayList;
+
 import appteam.nith.hillffair.R;
 import appteam.nith.hillffair.adapters.CoreTeamAdapter;
 import appteam.nith.hillffair.application.SharedPref;
 import appteam.nith.hillffair.models.CoreTeamItem;
 
-import java.util.ArrayList;
-
 public class CoreTeamActivity extends AppCompatActivity {
 
     RecyclerView recycler_view;
@@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) {
         recycler_view=(RecyclerView)findViewById(R.id.core_team_list);
         array_list=new ArrayList<>();
         array_list.add(new CoreTeamItem("Ajay k. Sharma","Director",BASE_URL+"photos/director.jpg"));
-        array_list.add(new CoreTeamItem("Dr. Raman Parti","Dean Student Welfare","https://s3-ap-southeast-1.amazonaws.com/nimbus2k16/nimbusteam/raman_parti.png"));
+        array_list.add(new CoreTeamItem("Dr. A.S. Singha","Dean Student Welfare",BASE_URL+"photos/as.jpg"));
         array_list.add(new CoreTeamItem("Dr. Surender Soni","Faculty Coordinator","https://s3-ap-southeast-1.amazonaws.com/nimbus2k16/nimbusteam/surender_soni.png"));
 
         array_list.add(new CoreTeamItem("Deepak Kumar Jain","Hillffair Secretary",BASE_URL_JSEC+"sec_cultural.jpg"));

app/src/main/java/appteam/nith/hillffair/activities/SplashActivity.java

@@ -4,17 +4,16 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 
-import appteam.nith.hillffair.Notification.DbHelper;
-import appteam.nith.hillffair.R;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.target.Target;
 
+import appteam.nith.hillffair.R;
+
 public class SplashActivity extends AppCompatActivity {
     private static final long TIME_SPLASH =1500 ;
     private ImageView image_splash;
@@ -25,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_splash);
         image_splash = (ImageView) findViewById(R.id.image_spalsh);
-        Target<GlideDrawable> into = Glide.with(SplashActivity.this).load(R.drawable.splash_new).into(image_splash);
+        Target<GlideDrawable> into = Glide.with(SplashActivity.this).load(R.drawable.splash_new2).into(image_splash);
         Handler handler=new Handler();
         handler.postDelayed(new Runnable() {
             @Override

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

@@ -16,8 +16,8 @@
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
     <android.support.v7.widget.RecyclerView
         android:layout_below="@+id/my_toolbar"
-        android:paddingTop="16dp"
-        android:paddingLeft="16dp"
+        android:layout_marginLeft="6dp"
+        android:layout_marginRight="6dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/activity_notification_listview"

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

@@ -20,6 +20,7 @@
         app:cardElevation="5dp">
 
         <RelativeLayout
+
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 

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

@@ -44,10 +44,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:padding="4dp"
-
         />
 
-
 </RelativeLayout>
     <TextView
         android:layout_width="match_parent"
@@ -56,7 +54,8 @@
         android:text="title"
         android:id="@+id/not_title"
         android:layout_marginTop="12dp"
-        android:paddingLeft="5dp"
+        android:padding="5dp"
+        android:layout_margin="5dp"
         android:layout_alignTop="@+id/frstimg"
         android:layout_toRightOf="@+id/frstimg"
         android:layout_toEndOf="@+id/frstimg" />