diff --git a/app/build.gradle b/app/build.gradle index f271de7..83f17bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,14 +38,8 @@ dependencies { compile 'com.onesignal:OneSignal:3.+@aar' compile "com.google.android.gms:play-services-gcm:10.2.0" compile 'com.google.android.gms:play-services-maps:10.2.0' - compile 'de.hdodenhof:circleimageview:1.3.0' compile 'com.android.support:support-v4:25.1.0' compile 'com.github.jd-alexander:LikeButton:0.2.0' compile 'com.cloudinary:cloudinary-android:1.2.2' compile 'com.android.support:palette-v7:25.0.1' - - compile 'net.steamcrafted:load-toast:1.0.10' - compile 'com.squareup.okhttp3:logging-interceptor:3.2.0' - compile 'com.github.florent37:materialleanback:1.0.2' - compile 'com.nineoldandroids:library:2.4.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7fb3758..e2a8dd0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ @@ -47,7 +47,11 @@ + android:theme="@style/AppTheme.NoActionBar" > + + @@ -127,12 +131,20 @@ + android:theme="@style/AppTheme.NoActionBar" > + + + android:theme="@style/AppTheme.NoActionBar"> + + @@ -141,7 +153,11 @@ android:value="com.nith.appteam.nimbus.Activity.MainActivity" /> - + + + diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java index 3441a24..034eddc 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java @@ -22,7 +22,7 @@ public class AboutActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_about); + setContentView(R.layout.content_about); initCollapsingToolbar(); toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/MainActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/MainActivity.java index 2715bcd..3b867a4 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/MainActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/MainActivity.java @@ -54,9 +54,7 @@ public class MainActivity extends AppCompatActivity { private ImageView imgNavHeaderBg, imgProfile; private TextView txtName, txtSubName; Toolbar toolbar; - private LinearLayout quiz_layout, gallery_layout, - map_layout, newsfeed_layout, coreteam_layout , - aboutnimbus_layout , teams_layout, feedback_layout; + private LinearLayout quiz_layout, gallery_layout, map_layout, newsfeed_layout, coreteam_layout , aboutnimbus_layout , teams_layout, feedback_layout,sponsor_layout,workshop_layout,contributor_layout; //public static int navItemIndex = 0; @@ -139,7 +137,9 @@ public void init(){ aboutnimbus_layout= (LinearLayout) findViewById(R.id.aboutnimbus_layout); teams_layout= (LinearLayout) findViewById(R.id.teams_layout); feedback_layout= (LinearLayout) findViewById(R.id.feedback_layout); - + contributor_layout= (LinearLayout) findViewById(R.id.contributor_layout); + sponsor_layout= (LinearLayout) findViewById(R.id.sponsor_layout); + workshop_layout= (LinearLayout) findViewById(R.id.workshop_layout); bottomNavigationView= (BottomNavigationView) findViewById(R.id.bottom_navigation); } @@ -155,14 +155,14 @@ public void onClick(View v) { gallery_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + startActivity(new Intent(MainActivity.this,GalleryActivity.class)); } }); map_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + startActivity(new Intent(MainActivity.this,MapActivity.class)); } }); @@ -176,28 +176,53 @@ public void onClick(View v) { coreteam_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(MainActivity.this,TeamActivity.class)); + startActivity(new Intent(MainActivity.this,CoreTeamActivity.class)); } }); aboutnimbus_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + startActivity(new Intent(MainActivity.this,AboutActivity.class)); } }); teams_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + startActivity(new Intent(MainActivity.this,TeamActivity.class)); } }); feedback_layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + Intent intent = new Intent(Intent.ACTION_SENDTO); + String uriText = "mailto:" + Uri.encode("appteam.nith@gmail.com") + "?subject=" + Uri.encode("Reporting A Bug/Feedback") + "&body=" + Uri.encode("Hello, \nI want to report a bug/give feedback corresponding to the app Nimbus App.\n.....\n\n-Your name"); + Uri uri = Uri.parse(uriText); + intent.setData(uri); + startActivity(Intent.createChooser(intent, "Send Email")); + } + }); + workshop_layout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(MainActivity.this,Workshops.class)); + } + }); + + sponsor_layout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(MainActivity.this,SponsorActivity.class)); + } + }); + + contributor_layout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(MainActivity.this,ContributorsActivity.class)); } }); @@ -278,11 +303,6 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { alertDialog.show(); drawer.closeDrawers(); return true; - case R.id.nav_settings: - //navItemIndex = 2; - //startActivity(new Intent(MainActivity.this, XYZ.class)); - drawer.closeDrawers(); - return true; case R.id.nav_team: startActivity(new Intent(MainActivity.this, ContributorsActivity.class)); drawer.closeDrawers(); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/NewsFeedActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/NewsFeedActivity.java index 5f3b885..c35abb3 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/NewsFeedActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/NewsFeedActivity.java @@ -2,7 +2,9 @@ import android.content.Intent; import android.os.Bundle; +import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; import android.support.v4.text.TextDirectionHeuristicCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.ActionBar; @@ -36,8 +38,6 @@ public class NewsFeedActivity extends AppCompatActivity implements SwipeRefreshLayout.OnRefreshListener{ private static final String FEED_LIST ="list" ; - private TextView tv; - private TextView des; private RecyclerView recyclerView; private NewsFeedAdapter adapter; private ProgressBar progressBar; @@ -46,6 +46,7 @@ public class NewsFeedActivity extends AppCompatActivity implements SwipeRefreshL private int pastVisiblesItems, visibleItemCount, totalItemCount, previousTotal = 0, visibleThreshold = 0,feedNo=1; private ArrayList list=new ArrayList<>(); private SharedPref pref; + private CoordinatorLayout coordinatorLayout; @Override protected void onCreate(Bundle savedInstanceState) { @@ -53,14 +54,14 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.newsfeed); + coordinatorLayout= (CoordinatorLayout) findViewById(R.id.core_view); swipeRefreshLayout= (SwipeRefreshLayout) findViewById(R.id.swipeRefresh); swipeRefreshLayout.setOnRefreshListener(this); Toolbar toolbar = (Toolbar) findViewById(R.id.my_toolbar); progressBar= (ProgressBar) findViewById(R.id.progress); setSupportActionBar(toolbar); ActionBar ab = getSupportActionBar(); - tv = (TextView)findViewById(R.id.user_name); - des = (TextView) findViewById(R.id.user_msg); + // Enable the Up button ab.setDisplayHomeAsUpEnabled(true); recyclerView = (RecyclerView) findViewById(R.id.recycler_view); @@ -96,8 +97,18 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) { }); - if(savedInstanceState==null) - showData(1); + if(savedInstanceState==null){ + if(pref.getUserId().isEmpty()){ + progressBar.setVisibility(View.GONE); + Snackbar.make(coordinatorLayout,"Please Login To See The Content",Snackbar.LENGTH_INDEFINITE).setAction("Login", new View.OnClickListener() { + @Override + public void onClick(View v) { + startActivity(new Intent(NewsFeedActivity.this,LoginActivity.class)); + } + }).show(); + } + else + showData(1);} else { list=savedInstanceState.getParcelableArrayList(FEED_LIST); @@ -179,7 +190,13 @@ public void onResponse(Call call, Response r } - Toast.makeText(NewsFeedActivity.this,"Unable to fetch Data",Toast.LENGTH_SHORT).show(); + Snackbar.make(coordinatorLayout,"Unable To load Data",Snackbar.LENGTH_INDEFINITE).setAction("Reload", new View.OnClickListener() { + @Override + public void onClick(View v) { + progressBar.setVisibility(View.VISIBLE); + showData(1); + } + }).show(); } } diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/QuizQuestionActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/QuizQuestionActivity.java index 6b3ad73..9862926 100755 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/QuizQuestionActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/QuizQuestionActivity.java @@ -80,9 +80,14 @@ public void onClick(View view) { SharedPref pref=new SharedPref(this); String userId=pref.getUserId(); + if(!userId.isEmpty()){ loadQuizwithRetrofit(userId); + t=new timer(this,time_left);} + else { + message.setText("Please Login to Play Quiz "); + } + - t=new timer(this,time_left); } diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java index ab6718d..200f8e0 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/TeamEventActivity.java @@ -1,14 +1,18 @@ package com.nith.appteam.nimbus.Activity; import android.content.Intent; +import android.graphics.Bitmap; import android.graphics.Color; import android.os.Bundle; import android.support.design.widget.AppBarLayout; +import android.support.v4.graphics.drawable.RoundedBitmapDrawable; +import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.CardView; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; +import android.util.Log; import android.view.View; import android.view.animation.AlphaAnimation; import android.widget.ImageView; @@ -19,6 +23,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; +import com.bumptech.glide.load.resource.drawable.GlideDrawable; +import com.bumptech.glide.request.target.ImageViewTarget; import com.nith.appteam.nimbus.Adapter.EventAdapter; import com.nith.appteam.nimbus.Adapter.ProjectAdapter; import com.nith.appteam.nimbus.Fragment.TeamFragment; @@ -34,6 +40,8 @@ import retrofit2.Callback; import retrofit2.Response; +import static android.R.attr.resource; + public class TeamEventActivity extends AppCompatActivity implements AppBarLayout.OnOffsetChangedListener { private static final float PERCENTAGE_TO_SHOW_TITLE_AT_TOOLBAR = 0.9f; @@ -45,7 +53,8 @@ public class TeamEventActivity extends AppCompatActivity implements AppBarLayout private TextView mTitle,teamDescription,headerTitle; private AppBarLayout mAppBarLayout; private Toolbar mToolbar; - private ImageView bannerImage,logoImage; + private ImageView bannerImage; + private ImageView logoView; private RecyclerView eventList; private EventAdapter adapter; private RecyclerView projectList; @@ -88,7 +97,16 @@ protected void onCreate(Bundle savedInstanceState) { teamDescription= (TextView) findViewById(R.id.teamDescription); headerTitle= (TextView) findViewById(R.id.header_title_team); bannerImage= (ImageView) findViewById(R.id.main_imageview_placeholder); - logoImage= (ImageView) findViewById(R.id.teamlogo); + logoView= (ImageView) findViewById(R.id.teamlogo); + Glide.with(TeamEventActivity.this).load(R.drawable.nimbuslogo).asBitmap().diskCacheStrategy(DiskCacheStrategy.ALL).error(R.drawable.w1).into(new ImageViewTarget(logoView) { + @Override + protected void setResource(Bitmap resource) { + RoundedBitmapDrawable drawable= RoundedBitmapDrawableFactory.create(TeamEventActivity.this.getResources(),resource); + drawable.setCircular(true); + logoView.setImageDrawable(drawable); + } + }); + eventList= (RecyclerView) findViewById(R.id.eventList); eventList.setLayoutManager(new LinearLayoutManager(this,LinearLayoutManager.HORIZONTAL,true)); @@ -113,7 +131,7 @@ public void onItemClick(View view, int position) { projectList.addOnItemTouchListener(new RecyclerItemClickListener(this, new RecyclerItemClickListener.OnItemClickListener() { @Override public void onItemClick(View view, int position) { - Intent i=new Intent(TeamEventActivity.this,WorkshopDetail.class); + // Intent i=new Intent(TeamEventActivity.this,WorkshopDetail.class); // i.putExtra(ACTIVITY,EVENT); // i.putExtra(EVENT_NAME,eventArrayList.get(position).getName()); // i.putExtra(ID,eventArrayList.get(position).getId()); @@ -200,8 +218,16 @@ public void onResponse(Call call, Response respons mTitle.setText(t.getName()); headerTitle.setText(t.getName()); teamDescription.setText(t.getDesc()); + Log.d("g",t.getLogo()); Glide.with(TeamEventActivity.this).load(t.getBanner()).diskCacheStrategy(DiskCacheStrategy.ALL).placeholder(R.drawable.nimbuslogo).into(bannerImage); - Glide.with(TeamEventActivity.this).load(t.getBanner()).diskCacheStrategy(DiskCacheStrategy.ALL).placeholder(R.drawable.nimbuslogo).into(logoImage); + Glide.with(TeamEventActivity.this).load(t.getLogo()).asBitmap().diskCacheStrategy(DiskCacheStrategy.ALL).error(R.drawable.w1).into(new ImageViewTarget(logoView) { + @Override + protected void setResource(Bitmap resource) { + RoundedBitmapDrawable drawable= RoundedBitmapDrawableFactory.create(TeamEventActivity.this.getResources(),resource); + drawable.setCircular(true); + logoView.setImageDrawable(drawable); + } + }); CardView card=(CardView)findViewById(R.id.card_desc); TextView eventlabel=(TextView)findViewById(R.id.eventslabel); TextView projectslabel=(TextView)findViewById(R.id.eventslabel); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/UploadNewsFeedActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/UploadNewsFeedActivity.java index 955b878..32d9543 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Activity/UploadNewsFeedActivity.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/UploadNewsFeedActivity.java @@ -84,7 +84,7 @@ public void onClick(View view) { i.putExtra(UPLOAD_SERVICE,true); i.putExtra(TITLE,add.title); i.putExtra(DESCRIPTION,add.detail); - + if(!imageUrl.toString().isEmpty()) i.putExtra(URL_IMAGE,imageUrl.toString()); startService(i); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Adapter/NewsFeedAdapter.java b/app/src/main/java/com/nith/appteam/nimbus/Adapter/NewsFeedAdapter.java index 4e57c6b..b1c3f54 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Adapter/NewsFeedAdapter.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Adapter/NewsFeedAdapter.java @@ -139,8 +139,6 @@ public void onClick(View v) { if(card.getPhoto()!=null&&!card.getPhoto().isEmpty()) Glide.with(mContext).load(card.getPhoto()).into(h.post_img); - else - h.post_img.setImageResource(R.drawable.team); Log.v("stwtus",""+card.isStatus()); if(card.isStatus()) h.lyk_status.setLiked(true); diff --git a/app/src/main/java/com/nith/appteam/nimbus/Adapter/SlidingImageAdapter.java b/app/src/main/java/com/nith/appteam/nimbus/Adapter/SlidingImageAdapter.java index 1f83e1d..82485d7 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Adapter/SlidingImageAdapter.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Adapter/SlidingImageAdapter.java @@ -21,7 +21,7 @@ public class SlidingImageAdapter extends PagerAdapter { //As discussed before the first two pics will not loaded from internet reason so that during poor connection. The page doesn't looks empty. - private int[] IMAGES = new int[]{R.drawable.slide_3, R.drawable.slide_4}; + private int[] IMAGES = new int[]{R.drawable.logo1, R.drawable.workshop}; private LayoutInflater inflater; private ArrayList urlList=new ArrayList<>(); private Context context; diff --git a/app/src/main/java/com/nith/appteam/nimbus/Utils/ApiInterface.java b/app/src/main/java/com/nith/appteam/nimbus/Utils/ApiInterface.java index 08c00e0..fa6315e 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Utils/ApiInterface.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Utils/ApiInterface.java @@ -49,7 +49,6 @@ public interface ApiInterface { Call getEventDetail(@Path("event_id") String event_id, @Query("student_id") String student_id); @POST("event/register/{event_id}") - @FormUrlEncoded Call getEventRegisterResponse(@Path("event_id") String event_id, @Field("student_id") String student_id); @GET("team/{id}") diff --git a/app/src/main/java/com/nith/appteam/nimbus/Utils/TeamLogoBehavior.java b/app/src/main/java/com/nith/appteam/nimbus/Utils/TeamLogoBehavior.java index 41c81be..bbe3d51 100644 --- a/app/src/main/java/com/nith/appteam/nimbus/Utils/TeamLogoBehavior.java +++ b/app/src/main/java/com/nith/appteam/nimbus/Utils/TeamLogoBehavior.java @@ -6,13 +6,14 @@ import android.support.v7.widget.Toolbar; import android.util.AttributeSet; import android.view.View; +import android.widget.ImageView; import com.nith.appteam.nimbus.R; -import de.hdodenhof.circleimageview.CircleImageView; + @SuppressWarnings("unused") -public class TeamLogoBehavior extends CoordinatorLayout.Behavior { +public class TeamLogoBehavior extends CoordinatorLayout.Behavior { private final static float MIN_AVATAR_PERCENTAGE_SIZE = 0.3f; private final static int EXTRA_FINAL_AVATAR_PADDING = 80; @@ -66,12 +67,12 @@ private void bindDimensions() { } @Override - public boolean layoutDependsOn(CoordinatorLayout parent, CircleImageView child, View dependency) { + public boolean layoutDependsOn(CoordinatorLayout parent, ImageView child, View dependency) { return dependency instanceof Toolbar; } @Override - public boolean onDependentViewChanged(CoordinatorLayout parent, CircleImageView child, View dependency) { + public boolean onDependentViewChanged(CoordinatorLayout parent, ImageView child, View dependency) { maybeInitProperties(child, dependency); final int maxScrollDistance = (int) (mStartToolbarPosition); @@ -109,7 +110,7 @@ public boolean onDependentViewChanged(CoordinatorLayout parent, CircleImageView return true; } - private void maybeInitProperties(CircleImageView child, View dependency) { + private void maybeInitProperties(ImageView child, View dependency) { if (mStartYPosition == 0) mStartYPosition = (int) (dependency.getY()); diff --git a/app/src/main/res/drawable/about.png b/app/src/main/res/drawable/about.png new file mode 100644 index 0000000..888b4e2 Binary files /dev/null and b/app/src/main/res/drawable/about.png differ diff --git a/app/src/main/res/drawable/contributor.png b/app/src/main/res/drawable/contributor.png new file mode 100644 index 0000000..2ebb37b Binary files /dev/null and b/app/src/main/res/drawable/contributor.png differ diff --git a/app/src/main/res/drawable/feedback.png b/app/src/main/res/drawable/feedback.png new file mode 100644 index 0000000..4553029 Binary files /dev/null and b/app/src/main/res/drawable/feedback.png differ diff --git a/app/src/main/res/drawable/forest_1.jpg b/app/src/main/res/drawable/forest_1.jpg deleted file mode 100644 index 3b9684e..0000000 Binary files a/app/src/main/res/drawable/forest_1.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/forest_2.jpg b/app/src/main/res/drawable/forest_2.jpg deleted file mode 100644 index 21ae846..0000000 Binary files a/app/src/main/res/drawable/forest_2.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/logo1.jpg b/app/src/main/res/drawable/logo1.jpg new file mode 100644 index 0000000..5808d7f Binary files /dev/null and b/app/src/main/res/drawable/logo1.jpg differ diff --git a/app/src/main/res/drawable/sponsor.png b/app/src/main/res/drawable/sponsor.png new file mode 100644 index 0000000..0604d5d Binary files /dev/null and b/app/src/main/res/drawable/sponsor.png differ diff --git a/app/src/main/res/drawable/teamwork.png b/app/src/main/res/drawable/teamwork.png new file mode 100644 index 0000000..8d52bd3 Binary files /dev/null and b/app/src/main/res/drawable/teamwork.png differ diff --git a/app/src/main/res/drawable/upload.png b/app/src/main/res/drawable/upload.png new file mode 100644 index 0000000..d81aa88 Binary files /dev/null and b/app/src/main/res/drawable/upload.png differ diff --git a/app/src/main/res/drawable/workshop.png b/app/src/main/res/drawable/workshop.png new file mode 100644 index 0000000..056db0b Binary files /dev/null and b/app/src/main/res/drawable/workshop.png differ diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml deleted file mode 100644 index c8a6b68..0000000 --- a/app/src/main/res/layout/activity_about.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ddc5f9b..f9fed6c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -96,7 +96,7 @@ android:layout_height="64dp" /> - + + + + + + + + + - + + + + @@ -205,25 +267,24 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - @@ -252,13 +313,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> @@ -61,8 +61,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:gravity="bottom|center" - android:text="App Team" - android:textColor="@android:color/black" + android:textColor="@android:color/white" + android:background="#5000" android:textSize="30sp" /> @@ -167,7 +167,6 @@ android:layout_height="match_parent" android:layout_marginLeft="8dp" android:gravity="center_vertical" - android:text="AppTeam" android:textColor="@android:color/white" android:textSize="20sp" /> @@ -175,14 +174,13 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_fblogin.xml b/app/src/main/res/layout/fragment_fblogin.xml index 2f2c484..9527d9a 100644 --- a/app/src/main/res/layout/fragment_fblogin.xml +++ b/app/src/main/res/layout/fragment_fblogin.xml @@ -9,7 +9,7 @@ android:layout_height="320dp" android:layout_centerHorizontal="true" android:layout_marginTop="54dp" - android:src="@drawable/nimbuslogo" /> + android:src="@drawable/logo_b_t" /> + android:layout_marginBottom="200dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_team.xml b/app/src/main/res/layout/fragment_team.xml index a557a77..93bdf28 100644 --- a/app/src/main/res/layout/fragment_team.xml +++ b/app/src/main/res/layout/fragment_team.xml @@ -20,11 +20,11 @@ android:padding="24dp"> + android:src="@drawable/upload" /> \ No newline at end of file diff --git a/app/src/main/res/layout/sliding_image_layout.xml b/app/src/main/res/layout/sliding_image_layout.xml index 4443eb0..664648b 100644 --- a/app/src/main/res/layout/sliding_image_layout.xml +++ b/app/src/main/res/layout/sliding_image_layout.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:src="@drawable/slide_4" - android:scaleType="centerCrop" + android:scaleType="fitXY" android:id="@+id/image"/> \ No newline at end of file diff --git a/app/src/main/res/layout/view_expand.xml b/app/src/main/res/layout/view_expand.xml index d29af19..5deb768 100644 --- a/app/src/main/res/layout/view_expand.xml +++ b/app/src/main/res/layout/view_expand.xml @@ -38,7 +38,10 @@ android:layout_height="192dp" custom:dominantMeasurement="height" /> - + - - Nimbus 2k17 + Udgham appintro Next Skip @@ -15,7 +15,7 @@ *Make sure to read all instructions before attempting the quiz - TeamActivity + Team What was the question? Hello blank fragment @@ -23,7 +23,7 @@ 1834013936864907 fb1834013936864907 - AboutActivity + About NIMBUS is the annual technical festival of National Institute of Technology, Hamirpur, Himachal Pradesh, India. It is touted to be an amalgamation of ideas, expressions, innovations, prototypes, knowledge channels, taken to the most premier levels. Nimbus has become the biggest technical fest of Northern India diff --git a/build.gradle b/build.gradle index 997f140..78acd74 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.2.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a56d3c..23b3820 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip