diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..ecf4174 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,24 @@ +version: 2 +jobs: + build: + docker: + - image: circleci/android:api-27-alpha + steps: + - checkout + - run: echo "A first hello" + + - run: + name: Add SDK 28 + command: echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-28" + + - run: + name: spotless check + command: ./gradlew spotlessCheck + + - run: + name: Run Tests + command: ./gradlew build + + - run: + name: spotless apply + command: ./gradlew spotlessApply \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3270997..12ad1c8 100644 --- a/.gitignore +++ b/.gitignore @@ -80,4 +80,4 @@ lint/generated/ lint/outputs/ lint/tmp/ # lint/reports/ -app/google-services.json + diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml deleted file mode 100644 index 8ec256a..0000000 --- a/.idea/render.experimental.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..2715ebb --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Anwesha2k20-Android-App +An app for the techno-cultural-management fest of IIT Patna. diff --git a/app/.gitignore b/app/.gitignore index 65d12b9..796b96d 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1 @@ /build -google-services.json \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e2398e5..78ee0c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,7 @@ +plugins { + id("com.diffplug.gradle.spotless") version "3.26.1" +} + apply plugin: 'com.android.application' apply plugin: 'com.google.gms.google-services' @@ -9,7 +13,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 5 - versionName "1.4" + versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -32,6 +36,13 @@ android { } } +spotless { + java { + target '**/*.java' + removeUnusedImports() + } +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' @@ -70,5 +81,8 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.6.1' implementation 'com.github.chrisbanes:PhotoView:2.3.0' + implementation 'com.github.smarteist:autoimageslider:1.3.2' + + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.17' } diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..5cc71a9 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,85 @@ +{ + "project_info": { + "project_number": "1085227589890", + "firebase_url": "https://anwesha2k20.firebaseio.com", + "project_id": "anwesha2k20", + "storage_bucket": "anwesha2k20.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:1085227589890:android:d724dafbd7c8be27f9621b", + "android_client_info": { + "package_name": "info.anwesha.iitp" + } + }, + "oauth_client": [ + { + "client_id": "1085227589890-b8240b7mmbg593i7621aucuk28ori74q.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "info.anwesha.iitp", + "certificate_hash": "a4e596ad083ab0612562d7c919334540da64ab7c" + } + }, + { + "client_id": "1085227589890-o6lajg512qphme2695fe9paklflfjkhu.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDYpNdKNNZH5naPzUYLA9UFJB2wEAVV-3U" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "1085227589890-o6lajg512qphme2695fe9paklflfjkhu.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:1085227589890:android:77d6cc48dc7e2542f9621b", + "android_client_info": { + "package_name": "info.anwesha.iitp" + } + }, + "oauth_client": [ + { + "client_id": "1085227589890-e3bd4g96agv8u4sc1ap8o0sgikl12hbl.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "info.anwesha.iitp", + "certificate_hash": "a4e596ad083ab0612562d7c919334540da64ab7c" + } + }, + { + "client_id": "1085227589890-o6lajg512qphme2695fe9paklflfjkhu.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDYpNdKNNZH5naPzUYLA9UFJB2wEAVV-3U" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "1085227589890-o6lajg512qphme2695fe9paklflfjkhu.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 175c29f..7217fec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,18 +2,24 @@ + - - - + + + + + + + - - - - - + android:theme="@style/AppTheme.NoActionBar"> - @@ -48,4 +50,6 @@ + + \ No newline at end of file diff --git a/app/src/main/java/info/anwesha/iitp/Auth/LoginFragment.java b/app/src/main/java/info/anwesha/iitp/Auth/LoginFragment.java index ac50d1e..e4afe97 100644 --- a/app/src/main/java/info/anwesha/iitp/Auth/LoginFragment.java +++ b/app/src/main/java/info/anwesha/iitp/Auth/LoginFragment.java @@ -68,7 +68,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat loginButton = view.findViewById(R.id.login_button); ImageView imageView = view.findViewById(R.id.login_image); - Glide.with(requireContext()).load(R.drawable.celesta_logo_long_2).into(imageView); + Glide.with(requireContext()).load(R.drawable.logo).into(imageView); loginButton.setOnClickListener(view13 -> { if (!CheckNetwork.isNetworkConnected(context)) diff --git a/app/src/main/java/info/anwesha/iitp/Auth/LoginRegisterActivity.java b/app/src/main/java/info/anwesha/iitp/Auth/LoginRegisterActivity.java index 2911e4d..6f7983c 100644 --- a/app/src/main/java/info/anwesha/iitp/Auth/LoginRegisterActivity.java +++ b/app/src/main/java/info/anwesha/iitp/Auth/LoginRegisterActivity.java @@ -21,8 +21,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_login_signup); if (!sharedPreferences.getBoolean("login_status", false)) - loadFragment(new LoginFragment()); - else loadFragment(new ProfileFragment()); + loadFragment(new RegisterFragment()); + else loadFragment(new RegisterFragment()); } private void loadFragment(Fragment fragment) { diff --git a/app/src/main/java/info/anwesha/iitp/Auth/ProfileFragment.java b/app/src/main/java/info/anwesha/iitp/Auth/ProfileFragment.java index e08ddb2..ffce198 100644 --- a/app/src/main/java/info/anwesha/iitp/Auth/ProfileFragment.java +++ b/app/src/main/java/info/anwesha/iitp/Auth/ProfileFragment.java @@ -35,11 +35,6 @@ import java.util.ArrayList; import java.util.List; -import info.anwesha.iitp.Auth.AuthApi; -import info.anwesha.iitp.Auth.LogoutResponse; -import info.anwesha.iitp.Auth.ProfileResponse; -import info.anwesha.iitp.Auth.RegisteredEventItem; -import info.anwesha.iitp.Auth.RegisteredEventsAdapter; import info.anwesha.iitp.R; import info.anwesha.iitp.network.RetrofitClientInstance; import info.anwesha.iitp.utils.CheckNetwork; diff --git a/app/src/main/java/info/anwesha/iitp/Auth/RegisterFragment.java b/app/src/main/java/info/anwesha/iitp/Auth/RegisterFragment.java index c51d72b..e595353 100644 --- a/app/src/main/java/info/anwesha/iitp/Auth/RegisterFragment.java +++ b/app/src/main/java/info/anwesha/iitp/Auth/RegisterFragment.java @@ -9,18 +9,16 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; +import android.webkit.WebSettings; +import android.webkit.WebView; import android.widget.EditText; -import android.widget.ImageView; -import android.widget.TextView; + import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.bumptech.glide.Glide; - import java.util.List; import info.anwesha.iitp.R; @@ -38,6 +36,7 @@ public class RegisterFragment extends Fragment { private EditText firstNameInput, lastNameInput, phoneInput, emailInput, collegeInput, passwordInput, confirmPasswordInput, referralInput, genderInput; private ProgressDialog progressDialog; private Context context; + private WebView registerView; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -48,35 +47,48 @@ public void onCreate(@Nullable Bundle savedInstanceState) { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_register, container, false); + if (!CheckNetwork.isNetworkConnected(requireContext())) { + Toast.makeText(requireContext(), "No Internet Connection!!!", Toast.LENGTH_LONG).show(); + View rootView = inflater.inflate(R.layout.fragment_no_internet, container, false); + return rootView; + } else { + View rootView = inflater.inflate(R.layout.fragment_register, container, false); + return rootView; + } } @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - - firstNameInput = view.findViewById(R.id.register_first_name_edittext); - lastNameInput = view.findViewById(R.id.register_last_name_edittext); - phoneInput = view.findViewById(R.id.register_phone_edittext); - emailInput = view.findViewById(R.id.register_email_edittext); - collegeInput = view.findViewById(R.id.register_school_college_edittext); - passwordInput = view.findViewById(R.id.register_password_edittext); - confirmPasswordInput = view.findViewById(R.id.register_confirm_password_edittext); - referralInput = view.findViewById(R.id.register_referral_edittext); - genderInput = view.findViewById(R.id.register_gender_edittext); - - TextView loginTextView = view.findViewById(R.id.login_textview); - loginTextView.setOnClickListener(view12 -> loadFragment(new info.anwesha.iitp.Auth.LoginFragment())); - - ImageView imageView = view.findViewById(R.id.register_image); - Glide.with(getContext()).load(R.drawable.celesta_logo_long_2).into(imageView); - - Button registerButton = view.findViewById(R.id.register_button); - registerButton.setOnClickListener(view1 -> { - if (!CheckNetwork.isNetworkConnected(context)) - Toast.makeText(getContext(), "Check your internet connection!!!", Toast.LENGTH_LONG).show(); - else register(); - }); + if (!CheckNetwork.isNetworkConnected(requireContext())) { + Toast.makeText(requireContext(), "No Internet Connection!!!", Toast.LENGTH_LONG).show(); + } else { + registerView = view.findViewById(R.id.registerWebView); + registerView.loadUrl("https://www.townscript.com/e/anwesha-iit-patna-214401"); + WebSettings webSettings = registerView.getSettings(); + webSettings.setJavaScriptEnabled(true); + } +// +// firstNameInput = view.findViewById(R.id.register_first_name_edittext); +// lastNameInput = view.findViewById(R.id.register_last_name_edittext); +// phoneInput = view.findViewById(R.id.register_phone_edittext); +// emailInput = view.findViewById(R.id.register_email_edittext); +// collegeInput = view.findViewById(R.id.register_school_college_edittext); +// passwordInput = view.findViewById(R.id.register_password_edittext); +// confirmPasswordInput = view.findViewById(R.id.register_confirm_password_edittext); +// referralInput = view.findViewById(R.id.register_referral_edittext); +// genderInput = view.findViewById(R.id.register_gender_edittext); +// +// TextView loginTextView = view.findViewById(R.id.login_textview); +// loginTextView.setOnClickListener(view12 -> loadFragment(new info.anwesha.iitp.Auth.LoginFragment())); +// +// +// Button registerButton = view.findViewById(R.id.register_button); +// registerButton.setOnClickListener(view1 -> { +// if (!CheckNetwork.isNetworkConnected(context)) +// Toast.makeText(getContext(), "Check your internet connection!!!", Toast.LENGTH_LONG).show(); +// else register(); +// }); } private void loadFragment(Fragment fragment) { diff --git a/app/src/main/java/info/anwesha/iitp/Auth/ResendActivationFragment.java b/app/src/main/java/info/anwesha/iitp/Auth/ResendActivationFragment.java index 6129a5e..df61135 100644 --- a/app/src/main/java/info/anwesha/iitp/Auth/ResendActivationFragment.java +++ b/app/src/main/java/info/anwesha/iitp/Auth/ResendActivationFragment.java @@ -56,7 +56,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat registerTextView.setOnClickListener(view1 -> loadFragment(new RegisterFragment())); ImageView imageView = view.findViewById(R.id.resend_image); - Glide.with( requireContext() ).load( R.drawable.celesta_logo_long_2 ).into(imageView); + Glide.with( requireContext() ).load( R.drawable.anwesha_logo_long_2 ).into(imageView); Button resendActivationButton = view.findViewById(R.id.resend_activation_button); resendActivationButton.setOnClickListener(view12 -> { diff --git a/app/src/main/java/info/anwesha/iitp/NoInternetFragment.java b/app/src/main/java/info/anwesha/iitp/NoInternetFragment.java new file mode 100644 index 0000000..c85f7c0 --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/NoInternetFragment.java @@ -0,0 +1,25 @@ +package info.anwesha.iitp; + + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +public class NoInternetFragment extends Fragment { + + public NoInternetFragment() { + // Required empty public constructor + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_no_internet, container, false); + } + +} diff --git a/app/src/main/java/info/anwesha/iitp/SplashActivity.java b/app/src/main/java/info/anwesha/iitp/SplashActivity.java new file mode 100644 index 0000000..be45245 --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/SplashActivity.java @@ -0,0 +1,26 @@ +package info.anwesha.iitp; + +import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; + +import info.anwesha.iitp.home.MainActivity; + +public class SplashActivity extends AppCompatActivity { + private static int SPLASH_TIME_OUT=3000; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + Intent splashIntent=new Intent(SplashActivity.this, MainActivity.class); + startActivity(splashIntent); + finish(); + } + },SPLASH_TIME_OUT); + } +} diff --git a/app/src/main/java/info/anwesha/iitp/about/AboutFragment.java b/app/src/main/java/info/anwesha/iitp/about/AboutFragment.java index 75aeffc..fd2f7e6 100644 --- a/app/src/main/java/info/anwesha/iitp/about/AboutFragment.java +++ b/app/src/main/java/info/anwesha/iitp/about/AboutFragment.java @@ -22,11 +22,11 @@ public class AboutFragment extends Fragment implements View.OnClickListener { + private Context context; + public AboutFragment() { } - private Context context; - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -47,51 +47,98 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat ImageView image2 = view.findViewById(R.id.image2); ImageView image3 = view.findViewById(R.id.image3); ImageView image4 = view.findViewById(R.id.image4); - + ImageView image5 = view.findViewById(R.id.image5); + ImageView image6 = view.findViewById(R.id.image6); + ImageView image7 = view.findViewById(R.id.image7); + ImageView image8 = view.findViewById(R.id.image8); + ImageView image9 = view.findViewById(R.id.image9); + ImageView image10 = view.findViewById(R.id.image10); CardView call1 = view.findViewById(R.id.card_call_1); CardView call2 = view.findViewById(R.id.card_call_2); CardView call3 = view.findViewById(R.id.card_call_3); CardView call4 = view.findViewById(R.id.card_call_4); + CardView call5 = view.findViewById(R.id.card_call_5); + CardView call6 = view.findViewById(R.id.card_call_6); + CardView call7 = view.findViewById(R.id.card_call_7); + CardView call8 = view.findViewById(R.id.card_call_8); + CardView call9 = view.findViewById(R.id.card_call_9); + CardView call10 = view.findViewById(R.id.card_call_10); call1.setOnClickListener(this); call2.setOnClickListener(this); call3.setOnClickListener(this); call4.setOnClickListener(this); + call5.setOnClickListener(this); + call6.setOnClickListener(this); + call7.setOnClickListener(this); + call8.setOnClickListener(this); + call9.setOnClickListener(this); + call10.setOnClickListener(this); CardView facebook1 = view.findViewById(R.id.card_facebook_1); CardView facebook2 = view.findViewById(R.id.card_facebook_2); CardView facebook3 = view.findViewById(R.id.card_facebook_3); CardView facebook4 = view.findViewById(R.id.card_facebook_4); + CardView facebook5 = view.findViewById(R.id.card_facebook_5); + CardView facebook8 = view.findViewById(R.id.card_facebook_8); + CardView facebook9 = view.findViewById(R.id.card_facebook_9); + CardView facebook10 = view.findViewById(R.id.card_facebook_10); facebook1.setOnClickListener(this); facebook2.setOnClickListener(this); facebook3.setOnClickListener(this); facebook4.setOnClickListener(this); - + facebook5.setOnClickListener(this); + facebook8.setOnClickListener(this); + facebook9.setOnClickListener(this); + facebook10.setOnClickListener(this); CardView github1 = view.findViewById(R.id.card_github_1); CardView github2 = view.findViewById(R.id.card_github_2); CardView github3 = view.findViewById(R.id.card_github_3); CardView github4 = view.findViewById(R.id.card_github_4); - + CardView github5 = view.findViewById(R.id.card_github_5); + CardView github6 = view.findViewById(R.id.card_github_6); + CardView github7 = view.findViewById(R.id.card_github_7); + CardView github8 = view.findViewById(R.id.card_github_8); + CardView github9 = view.findViewById(R.id.card_github_9); + CardView github10 = view.findViewById(R.id.card_github_10); github1.setOnClickListener(this); github2.setOnClickListener(this); github3.setOnClickListener(this); github4.setOnClickListener(this); + github5.setOnClickListener(this); + github6.setOnClickListener(this); + github7.setOnClickListener(this); + github8.setOnClickListener(this); + github9.setOnClickListener(this); + github10.setOnClickListener(this); Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/61836104_1185350021642288_3218647400700706816_n.jpg?_nc_cat=102&_nc_oc=AQks_Avrh-QmlQFcHGi2ug38TMWNY4xy6qpFT8fxfz451NDS3ahAIUOVwKIbn-O6KmE&_nc_ht=scontent.fdel29-1.fna&oh=ba5d514048981767bdc4b4c909b6708a&oe=5E35BDD7") - .placeholder(R.mipmap.celesta_icon_round).into(image1); + .placeholder(R.mipmap.anwesha_icon_round).into(image1); - Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/69644261_2115104492128356_6176772960083247104_n.jpg?_nc_cat=107&_nc_oc=AQk4WEUseafFdQvhhWhu0YFH6_9o8nBkkjTU7UJPzeK0NPWeppaKVIVUMtJUAGIZ6Yk&_nc_ht=scontent.fdel29-1.fna&oh=818707c46121857a62041b44ed4bd17c&oe=5DF2FCE3") - .placeholder(R.mipmap.celesta_icon_round).into(image2); - Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/18813995_1182737558521894_2753272857627730485_n.jpg?_nc_cat=101&_nc_oc=AQlG0F8XVl3PnNTA1LnzMcfZ3p4cElt7WOpCtOADvw6N7eQcw-97L2RhxGWq-T2VDGk&_nc_ht=scontent.fdel29-1.fna&oh=70217968ca8de55d0a842ceac8ab8f41&oe=5E3796AA") - .placeholder(R.mipmap.celesta_icon_round).into(image3); + Glide.with(context).load("https://avatars2.githubusercontent.com/u/40834245?s=460&v=4") + .placeholder(R.mipmap.anwesha_icon_round).into(image2); - Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/33490969_969879943175001_7316512759087104000_n.jpg?_nc_cat=105&_nc_oc=AQn_AxS6IX1lXlZZyVmn8sBqsAwQuU69Qg3VmDV65xgAmC_J9_zHJ5AkbPWEccCVU3A&_nc_ht=scontent.fdel29-1.fna&oh=871245e026dcfd1041ed75995ebe9deb&oe=5DF6A107") - .placeholder(R.mipmap.celesta_icon_round).into(image4); + Glide.with(context).load("http://anwesha.info/images/app/team/subhang.jpg") + .placeholder(R.mipmap.anwesha_icon_round).into(image3); + + Glide.with(context).load("https://scontent.fpat1-1.fna.fbcdn.net/v/t1.0-9/p960x960/81445064_2210647695907368_5005389852087156736_o.jpg?_nc_cat=102&_nc_ohc=Lph1sLQZf4cAQlaU9t4HrKLfnlufTTAbATMgGozV5_ffd5FqeBI1cr_jg&_nc_ht=scontent.fpat1-1.fna&oh=22884030cdb2cd9d39accd26e6c5307d&oe=5EA9F98C") + .placeholder(R.mipmap.anwesha_icon_round).into(image4); + + Glide.with(context).load("https://scontent.fdel29-1.fna.fbcdn.net/v/t1.0-9/18813995_1182737558521894_2753272857627730485_n.jpg?_nc_cat=101&_nc_oc=AQlG0F8XVl3PnNTA1LnzMcfZ3p4cElt7WOpCtOADvw6N7eQcw-97L2RhxGWq-T2VDGk&_nc_ht=scontent.fdel29-1.fna&oh=70217968ca8de55d0a842ceac8ab8f41&oe=5E3796AA") + .placeholder(R.mipmap.anwesha_icon_round).into(image5); + + + Glide.with(context).load("https://scontent.fdel1-2.fna.fbcdn.net/v/t1.0-0/p480x480/78411567_2411746825744895_7288578639686270976_o.jpg?_nc_cat=104&_nc_ohc=uONelHvmo7kAQkqKqMc4pmOjkmcHJtClYmEMVjkOhzZGlLMPcr43GCORA&_nc_ht=scontent.fdel1-2.fna&oh=a960d468686b630cd3aac20322d979f0&oe=5E8158ED") + .placeholder(R.mipmap.anwesha_icon_round).into(image6); + Glide.with(context).load("https://instagram.fjai3-1.fna.fbcdn.net/v/t51.2885-19/s320x320/79750612_1031570117203109_7214083372534988800_n.jpg?_nc_ht=instagram.fjai3-1.fna.fbcdn.net&_nc_ohc=cvcyutp4HtMAX_JU0g7&oh=04ec40bf767c5f4f18968ff32979bdcd&oe=5E96389E").placeholder(R.mipmap.anwesha_icon_round).into(image7); + Glide.with(context).load("https://scontent.fpat1-1.fna.fbcdn.net/v/t1.0-9/81556673_167301961289350_322462425142001664_n.jpg?_nc_cat=101&_nc_ohc=a4OckavxUEkAQnmtquIYbZATA5GKo74k5AOmbOxxlzl_Idjl6iURoGrDg&_nc_ht=scontent.fpat1-1.fna&oh=38e9c3a31824a4df0b3d284ba078fb31&oe=5E69CAD6").placeholder(R.mipmap.anwesha_icon_round).into(image8); + Glide.with(context).load("https://scontent.fdel1-2.fna.fbcdn.net/v/t1.0-9/cp0/e15/q65/p720x720/70253157_121698649207771_2210579453472407552_o.jpg?_nc_cat=101&efg=eyJpIjoidCJ9&_nc_ohc=34H-aQrEeN8AQnnzhF5YyAWV4m03VUw4DgCRoXzKiGZ964onzyDN-sSbQ&_nc_ht=scontent.fdel1-2.fna&oh=361bca9b62a39fe12c3a001792911247&oe=5E6ACA7C").placeholder(R.mipmap.anwesha_icon_round).into(image9); + Glide.with(context).load("https://scontent.fdel1-3.fna.fbcdn.net/v/t1.0-9/fr/cp0/e15/q65/72642224_121631915910324_2013199579935145984_o.jpg?_nc_cat=106&efg=eyJpIjoidCJ9&_nc_ohc=wqKSL8W66Q0AQnvcIC42Z_VOpy7lUxWeRVRwaniRQv_RHB0DqZMstbe0A&_nc_ht=scontent.fdel1-3.fna&oh=05f529eb7bf62d730129d33e870f7512&oe=5E6DC37B").placeholder(R.mipmap.anwesha_icon_round).into(image10); super.onViewCreated(view, savedInstanceState); } @@ -105,42 +152,102 @@ public void onClick(View view) { intent.setAction(Intent.ACTION_DIAL); intent.setData(Uri.parse("tel:+918299735195")); break; - case R.id.card_call_2: + case R.id.card_call_4: intent.setAction(Intent.ACTION_DIAL); intent.setData(Uri.parse("tel:+918967570983")); break; - case R.id.card_call_3: + case R.id.card_call_5: intent.setAction(Intent.ACTION_DIAL); intent.setData(Uri.parse("tel:+918013054710")); break; - case R.id.card_call_4: + case R.id.card_call_2: + intent.setAction(Intent.ACTION_DIAL); + intent.setData(Uri.parse("tel:+919821481639")); + break; + case R.id.card_call_3: + intent.setAction(Intent.ACTION_DIAL); + intent.setData(Uri.parse("tel:+918978880947")); + break; + + case R.id.card_call_6: + intent.setAction(Intent.ACTION_DIAL); + intent.setData(Uri.parse("tel:+917339799440")); + break; + case R.id.card_call_7: intent.setAction(Intent.ACTION_DIAL); - intent.setData(Uri.parse("tel:+917424904721")); + intent.setData(Uri.parse("tel:+919610306949")); break; + case R.id.card_call_8: + intent.setAction(Intent.ACTION_DIAL); + intent.setData(Uri.parse("tel:+918420607591")); + break; + case R.id.card_call_9: + intent.setAction(Intent.ACTION_DIAL); + intent.setData(Uri.parse("tel:+917704825224")); + break; + case R.id.card_call_10: + intent.setAction(Intent.ACTION_DIAL); + intent.setData(Uri.parse("tel:+918910664884")); + break; + case R.id.card_facebook_1: info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/ashwani.yadav9499"); return; - case R.id.card_facebook_2: + case R.id.card_facebook_4: info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/atm1504"); return; - case R.id.card_facebook_3: + case R.id.card_facebook_5: info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/somenath.sarkar.39"); return; - case R.id.card_facebook_4: - info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/amangrobo"); + case R.id.card_facebook_2: + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/amish.mittal.fliptrail"); + return; + case R.id.card_facebook_3: + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/subhang.vasireddy"); + return; + + case R.id.card_facebook_8: + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/debarghya.maity.52"); + return; + case R.id.card_facebook_9: + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/priyanka.sachan.77964201"); return; + case R.id.card_facebook_10: + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/mehuli.pal.1"); + return; + + case R.id.card_github_1: info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://github.com/ashwaniYDV"); return; case R.id.card_github_2: + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://github.com/fliptrail"); + return; + case R.id.card_github_4: info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://github.com/atm1504"); return; - case R.id.card_github_3: + case R.id.card_github_5: info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://github.com/somenath1435"); return; - case R.id.card_github_4: - IntentUtils.openWebBrowser(context, "https://github.com/amangrobo/"); + case R.id.card_github_3: + IntentUtils.openWebBrowser(context, "https://github.com/Subhang23"); + return; + case R.id.card_github_6: + IntentUtils.openWebBrowser(context, "https://github.com/s-ayush2903/"); + return; + case R.id.card_github_7: + IntentUtils.openWebBrowser(context, "https://github.com/Kavya-24"); + return; + case R.id.card_github_8: + IntentUtils.openWebBrowser(context, "https://github.com/debarghya472/"); return; + case R.id.card_github_9: + IntentUtils.openWebBrowser(context, "https://github.com/Priyanka-Sachan"); + return; + case R.id.card_github_10: + IntentUtils.openWebBrowser(context, "https://github.com/Mehulipal"); + return; + } startActivity(intent); diff --git a/app/src/main/java/info/anwesha/iitp/accomodation/AccomodationFragment.java b/app/src/main/java/info/anwesha/iitp/accomodation/AccomodationFragment.java new file mode 100644 index 0000000..27a7f6c --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/accomodation/AccomodationFragment.java @@ -0,0 +1,61 @@ +package info.anwesha.iitp.accomodation; + + +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.Spinner; + +import info.anwesha.iitp.R; + + +public class AccomodationFragment extends Fragment implements AdapterView.OnItemSelectedListener { + + private Button submit_button; + private Spinner accomodation_options_spinner; + + + public AccomodationFragment() { + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View rootview = inflater.inflate(R.layout.fragment_accomodation, container, false); + submit_button = rootview.findViewById(R.id.book_button); + accomodation_options_spinner = rootview.findViewById(R.id.accoomo_spinner); + return rootview; + + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + ArrayAdapter adapter = ArrayAdapter.createFromResource(requireContext(), R.array.days_array, android.R.layout.simple_spinner_item); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + accomodation_options_spinner.setAdapter(adapter); + submit_button.setClickable(false); + submit_button.setEnabled(false); + } + + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + accomodation_options_spinner.setOnItemSelectedListener(this); + + } + + @Override + public void onNothingSelected(AdapterView parent) { + } +} diff --git a/app/src/main/java/info/anwesha/iitp/contact/ContactFragment.java b/app/src/main/java/info/anwesha/iitp/contact/ContactFragment.java index 1cd647d..7458073 100644 --- a/app/src/main/java/info/anwesha/iitp/contact/ContactFragment.java +++ b/app/src/main/java/info/anwesha/iitp/contact/ContactFragment.java @@ -36,46 +36,36 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat CardView bus = view.findViewById(R.id.bus_schedule); CardView fb = view.findViewById(R.id.connect_facebook); CardView inst = view.findViewById(R.id.connect_instagram); - CardView twitter = view.findViewById(R.id.connect_twitter); CardView youtube = view.findViewById(R.id.connect_youtube); CardView link = view.findViewById(R.id.connect_linkedin); fb.setOnClickListener(this); inst.setOnClickListener(this); - twitter.setOnClickListener(this); youtube.setOnClickListener(this); link.setOnClickListener(this); bus.setOnClickListener(this); - - super.onViewCreated(view, savedInstanceState); } @Override public void onClick(View view) { - int id = view.getId(); - switch (id) { case R.id.bus_schedule: - info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.iitp.ac.in/index.php?option=com_content&view=article&id=60&Itemid=66"); + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "http://anwesha.info/gallery/bus.pdf"); break; case R.id.connect_facebook: - info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.facebook.com/CelestaIITP/"); + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://m.facebook.com/anwesha.iitpatna/"); break; case R.id.connect_instagram: - info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.instagram.com/celestaiitp_official/"); - break; - case R.id.connect_twitter: - info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://twitter.com/celesta_iitp"); + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.instagram.com/anwesha.iitp/"); break; case R.id.connect_youtube: - info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.youtube.com/channel/UCd8RpmJktBOwqT4OehcCjjg"); + info.anwesha.iitp.utils.IntentUtils.openWebBrowser(context, "https://www.youtube.com/user/AnweshaIITP"); break; case R.id.connect_linkedin: - IntentUtils.openWebBrowser(context, "https://www.linkedin.com/in/celesta-iit-patna-3722b6166/"); + IntentUtils.openWebBrowser(context, "https://in.linkedin.com/company/anweshaiitp"); break; } - } } \ No newline at end of file diff --git a/app/src/main/java/info/anwesha/iitp/events/EventDetailsFragment.java b/app/src/main/java/info/anwesha/iitp/events/EventDetailsFragment.java index f401ac3..b45a0cf 100644 --- a/app/src/main/java/info/anwesha/iitp/events/EventDetailsFragment.java +++ b/app/src/main/java/info/anwesha/iitp/events/EventDetailsFragment.java @@ -8,20 +8,20 @@ import android.content.res.ColorStateList; import android.net.Uri; import android.os.Bundle; -import android.util.Log; +//import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; -import android.widget.EditText; +//import android.widget.Button; +//import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; +//import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; +//import androidx.appcompat.app.AlertDialog; import androidx.cardview.widget.CardView; import androidx.lifecycle.ViewModelProviders; import androidx.preference.PreferenceManager; @@ -30,21 +30,19 @@ import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; -import java.util.List; +/*import java.util.List; import info.anwesha.iitp.Auth.LoginRegisterActivity; -import info.anwesha.iitp.Auth.LogoutResponse; +import info.anwesha.iitp.Auth.LogoutResponse;*/ import info.anwesha.iitp.R; -import info.anwesha.iitp.events.EventItem; -import info.anwesha.iitp.events.EventsViewModel; -import info.anwesha.iitp.network.EventsRoutes; -import info.anwesha.iitp.network.RetrofitClientInstance; +//import info.anwesha.iitp.network.EventsRoutes; +//import info.anwesha.iitp.network.RetrofitClientInstance; import info.anwesha.iitp.utils.ImageViewerActivity; -import okhttp3.MultipartBody; +/*import okhttp3.MultipartBody; import okhttp3.RequestBody; import retrofit2.Call; import retrofit2.Callback; -import retrofit2.Response; +import retrofit2.Response;*/ public class EventDetailsFragment extends BottomSheetDialogFragment { @@ -120,7 +118,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat CardView cardQua = view.findViewById(R.id.card_event_details_qua); CardView cardPen = view.findViewById(R.id.card_event_details_pen); - Button register = view.findViewById(R.id.button_register); + //Button register = view.findViewById(R.id.button_register); if (color[0] != 0) { cardPrimary.setCardBackgroundColor(color[0]); @@ -128,7 +126,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat cardTer.setCardBackgroundColor(color[0]); cardQua.setCardBackgroundColor(color[0]); cardPen.setCardBackgroundColor(color[0]); - register.setBackgroundTintList(ColorStateList.valueOf(color[0])); + // register.setBackgroundTintList(ColorStateList.valueOf(color[0])); } TextView name = view.findViewById(R.id.name); @@ -153,7 +151,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat organiserPhone.setImageTintList(ColorStateList.valueOf(color[2])); rulebook.setTextColor(color[2]); rulebookImg.setImageTintList(ColorStateList.valueOf(color[2])); - register.setTextColor(color[2]); + //register.setTextColor(color[2]); } name.setText(current.getEvName()); @@ -199,7 +197,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat cardPen.setVisibility(View.GONE); } - if (current.getEvAmount() != null && !current.getEvAmount().isEmpty()) { + /*if (current.getEvAmount() != null && !current.getEvAmount().isEmpty()) { register.setText(String.format("Register (₹ %s)", current.getEvAmount())); } @@ -266,11 +264,11 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) Log.e("Error", "onFailure: " + t.getMessage()); Toast.makeText(context, "Something went wrong!!!", Toast.LENGTH_LONG).show(); } - }); + });*/ } - private void showAlertDialog() { + /*private void showAlertDialog() { final View dialogView = getLayoutInflater().inflate(R.layout.dialog_register_team_event, null); AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); @@ -319,9 +317,9 @@ private void showAlertDialog() { }); alertDialog.show(); - } + }*/ - private void registerTeamEvent(String teamName, String c1, String c2, String c3, String c4, String c5, AlertDialog alertDialog) { + /*private void registerTeamEvent(String teamName, String c1, String c2, String c3, String c4, String c5, AlertDialog alertDialog) { progressDialog.setMessage("Registering..."); if (progressDialog != null) progressDialog.show(); @@ -369,5 +367,5 @@ public void onFailure(@NonNull Call call, @NonNull Throwable t) } }); - } + }*/ } diff --git a/app/src/main/java/info/anwesha/iitp/events/EventsDao.java b/app/src/main/java/info/anwesha/iitp/events/EventsDao.java index 429c0fd..ce6fa88 100644 --- a/app/src/main/java/info/anwesha/iitp/events/EventsDao.java +++ b/app/src/main/java/info/anwesha/iitp/events/EventsDao.java @@ -7,14 +7,13 @@ import java.util.List; -import info.anwesha.iitp.events.EventItem; import static androidx.room.OnConflictStrategy.REPLACE; @Dao public interface EventsDao { - @Query("SELECT * FROM events WHERE evCategory = 'Eventscollege' OR evCategory = 'Eventsall' ORDER BY evStartTime ASC") + @Query("SELECT * FROM events WHERE evCategory = 'pronite' OR evCategory = 'proshow' OR evCategory='pre-anwesha' OR evCategory='informal' OR evCategory='technical' OR evCategory = 'cultural' OR evCategory = 'awelfare' ORDER BY evStartTime ASC") LiveData> loadAllEvents(); @Query("SELECT * FROM events WHERE evCategory = 'Exhibitions' ORDER BY evStartTime ASC") @@ -35,6 +34,12 @@ public interface EventsDao { @Query("SELECT evClub FROM events WHERE evCategory = 'Eventscollege' OR evCategory = 'Eventsall'") LiveData> loadAllClubs(); + @Query("SELECT evCategory FROM events WHERE evCategory = 'technical' OR evCategory = 'cultural' OR evCategory = 'awelfare'") + LiveData> loadCompetetionsCategory(); + + @Query("SELECT evCategory FROM events WHERE evCategory = 'pronite' OR evCategory = 'proshow' OR evCategory='pre-anwesha' OR evCategory='informal' ") + LiveData> loadEventsCategory(); + @Query("select * from events where id = :id") EventItem loadEventById(String id); diff --git a/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java b/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java index bde5895..45f6c21 100644 --- a/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java +++ b/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java @@ -3,7 +3,6 @@ import android.content.Context; import android.os.Bundle; import android.transition.TransitionInflater; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,15 +13,16 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import androidx.navigation.fragment.NavHostFragment; + +import info.anwesha.iitp.R; + +import android.util.Log; import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - import java.util.ArrayList; import java.util.List; - -import info.anwesha.iitp.R; import info.anwesha.iitp.network.EventsRoutes; import info.anwesha.iitp.network.RetrofitClientInstance; import retrofit2.Call; @@ -33,7 +33,7 @@ public class EventsFragment extends Fragment { private static final String ARG_PARAM1 = "data"; - private String club; + private String category; private info.anwesha.iitp.events.EventsRecyclerAdapter adapter; private info.anwesha.iitp.events.EventsViewModel viewModel; private SwipeRefreshLayout swipeRefreshLayout; @@ -46,7 +46,7 @@ public EventsFragment() { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getArguments() != null) { - club = getArguments().getString(ARG_PARAM1); + category = getArguments().getString(ARG_PARAM1); } viewModel = ViewModelProviders.of(this).get(EventsViewModel.class); @@ -65,9 +65,30 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - + String new_show="Test"; if (getActivity() != null) - ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(club + " Events"); + { + if(category.equals("awelfare")) + new_show="Arts and Welfare"; + else + if(category.equals("cultural")) + new_show="Cultural"; + else + if(category.equals("technical")) + new_show="Technical"; + else + if(category.equals("proshow")) + new_show="Proshow"; + else + if(category.equals("pronite")) + new_show="Pronite"; + else + if(category.equals("pre-anwesha")) + new_show="Pre-Anwesha"; + else + if(category.equals("informal")) + new_show="Informal"; + ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(new_show + " Events");} swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_events); swipeRefreshLayout.setOnRefreshListener(this::updateData); @@ -87,7 +108,7 @@ private void observeAll() { viewModel.loadAllEvents().observe(this, eventItems -> { List newList = new ArrayList<>(); for (info.anwesha.iitp.events.EventItem n : eventItems) { - if (n.getEvClub().equals(club)) newList.add(n); + if (n.getEvCategory().equals(category)) newList.add(n); } adapter.setEventItemList(newList); }); diff --git a/app/src/main/java/info/anwesha/iitp/events/EventsRepository.java b/app/src/main/java/info/anwesha/iitp/events/EventsRepository.java index 6a93102..353c8c7 100644 --- a/app/src/main/java/info/anwesha/iitp/events/EventsRepository.java +++ b/app/src/main/java/info/anwesha/iitp/events/EventsRepository.java @@ -19,6 +19,8 @@ public class EventsRepository { private LiveData> allLectures; private LiveData> allWorkshops; private LiveData> allClubs; + private LiveData> allCompetetions; + private LiveData> allEventsCategory; public EventsRepository(Application application) { info.anwesha.iitp.database.AppDatabase db = AppDatabase.getDatabase(application); @@ -30,6 +32,8 @@ public EventsRepository(Application application) { allLectures = eventsDao.loadGuestTalks(); allWorkshops = eventsDao.loadWorkshops(); allClubs = eventsDao.loadAllClubs(); + allCompetetions = eventsDao.loadCompetetionsCategory(); + allEventsCategory=eventsDao.loadEventsCategory(); } public LiveData> loadAllEvents() { @@ -55,6 +59,14 @@ public LiveData> loadAllClubs() { return allClubs; } + public LiveData> loadCompetetions() { + return allCompetetions; + } + + public LiveData> loadEventsCategory() { + return allEventsCategory; + } + public void insert(info.anwesha.iitp.events.EventItem eventItem) { new insertAsyncTask(eventsDao).execute(eventItem); } diff --git a/app/src/main/java/info/anwesha/iitp/events/EventsViewModel.java b/app/src/main/java/info/anwesha/iitp/events/EventsViewModel.java index 8b49ddf..bf7c05b 100644 --- a/app/src/main/java/info/anwesha/iitp/events/EventsViewModel.java +++ b/app/src/main/java/info/anwesha/iitp/events/EventsViewModel.java @@ -13,12 +13,16 @@ public class EventsViewModel extends AndroidViewModel { private info.anwesha.iitp.events.EventsRepository eventsRepository; private LiveData> allEvents; private LiveData> allClubs; + private LiveData> allCompetetions; + private LiveData> allEventsCategory; public EventsViewModel(@NonNull Application application) { super(application); eventsRepository = new EventsRepository(application); allEvents = eventsRepository.loadAllEvents(); allClubs = eventsRepository.loadAllClubs(); + allCompetetions=eventsRepository.loadCompetetions(); + allEventsCategory=eventsRepository.loadEventsCategory(); } LiveData> loadAllEvents() { @@ -29,6 +33,14 @@ public LiveData> loadAllClubs() { return allClubs; } + public LiveData> loadCompetetionsCategory() { + return allCompetetions; + } + + public LiveData> loadEventsCategory() { + return allEventsCategory; + } + public void insert(info.anwesha.iitp.events.EventItem eventItem) { eventsRepository.insert(eventItem); } diff --git a/app/src/main/java/info/anwesha/iitp/gallery/GalleryDao.java b/app/src/main/java/info/anwesha/iitp/gallery/GalleryDao.java index 764c35a..1e62c9e 100644 --- a/app/src/main/java/info/anwesha/iitp/gallery/GalleryDao.java +++ b/app/src/main/java/info/anwesha/iitp/gallery/GalleryDao.java @@ -6,7 +6,6 @@ import java.util.List; -import info.anwesha.iitp.gallery.Image; import static androidx.room.OnConflictStrategy.REPLACE; diff --git a/app/src/main/java/info/anwesha/iitp/game/GameFragment.java b/app/src/main/java/info/anwesha/iitp/game/GameFragment.java new file mode 100644 index 0000000..b998d9d --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/game/GameFragment.java @@ -0,0 +1,63 @@ +package info.anwesha.iitp.game; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import info.anwesha.iitp.R; +import info.anwesha.iitp.utils.CheckNetwork; + +public class GameFragment extends Fragment { + + WebView gameView; + private ViewGroup container; + + public GameFragment() { + // Required empty public constructor + } + + public static GameFragment newInstance(String param1, String param2) { + GameFragment fragment = new GameFragment(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + if (!CheckNetwork.isNetworkConnected(requireContext())) { + Toast.makeText(requireContext(), "No Internet Connection!!!", Toast.LENGTH_LONG).show(); + View rootView = inflater.inflate(R.layout.fragment_no_internet, container, false); + return rootView; + } else { + View rootView = inflater.inflate(R.layout.fragment_game, container, false); + return rootView; + } + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + if (!CheckNetwork.isNetworkConnected(requireContext())) { + Toast.makeText(requireContext(), "No Internet Connection!!!", Toast.LENGTH_LONG).show(); + } else { + gameView = view.findViewById(R.id.gameWebView); + gameView.loadUrl("https://5de6b07d668a1b74c0882d39--agitated-agnesi-547910.netlify.com/"); + WebSettings webSettings = gameView.getSettings(); + webSettings.setJavaScriptEnabled(true); + } + } +} diff --git a/app/src/main/java/info/anwesha/iitp/home/EventCategoryFragment.java b/app/src/main/java/info/anwesha/iitp/home/EventCategoryFragment.java index cb4c71f..7f90b06 100644 --- a/app/src/main/java/info/anwesha/iitp/home/EventCategoryFragment.java +++ b/app/src/main/java/info/anwesha/iitp/home/EventCategoryFragment.java @@ -25,7 +25,6 @@ import info.anwesha.iitp.R; import info.anwesha.iitp.events.EventItem; import info.anwesha.iitp.events.EventsViewModel; -import info.anwesha.iitp.home.EventsCategoryAdapter; import info.anwesha.iitp.network.EventsRoutes; import info.anwesha.iitp.network.RetrofitClientInstance; import retrofit2.Call; @@ -45,11 +44,17 @@ public EventCategoryFragment() { private View emptyView; private SharedPreferences preferences; + String types; + private Context context; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + if (getArguments() != null) { + types = String.valueOf(getArguments().getString("type")); + } setEnterTransition(TransitionInflater.from(requireContext()).inflateTransition(android.R.transition.fade)); viewModel = ViewModelProviders.of(this).get(EventsViewModel.class); if (getContext() != null) @@ -90,24 +95,47 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat } private void observeAll() { - viewModel.loadAllClubs().observe(this, strings -> { - List temp = new ArrayList<>(); + if (types.equals("events")) { + viewModel.loadEventsCategory().observe(this, strings -> { - for (String s : strings) - if (!temp.contains(s)) - temp.add(s); + List temp = new ArrayList<>(); - adapter.setEventCategoryList(temp); + for (String s : strings) + if (!temp.contains(s)) + temp.add(s); + + adapter.setEventCategoryList(temp); + + if (strings.size() == 0) { + recyclerView.setVisibility(View.INVISIBLE); + emptyView.setVisibility(View.VISIBLE); + } else { + recyclerView.setVisibility(View.VISIBLE); + emptyView.setVisibility(View.INVISIBLE); + } + }); + } else { + viewModel.loadCompetetionsCategory().observe(this, strings -> { + + List temp = new ArrayList<>(); + + for (String s : strings) + if (!temp.contains(s)) + temp.add(s); + + adapter.setEventCategoryList(temp); + + if (strings.size() == 0) { + recyclerView.setVisibility(View.INVISIBLE); + emptyView.setVisibility(View.VISIBLE); + } else { + recyclerView.setVisibility(View.VISIBLE); + emptyView.setVisibility(View.INVISIBLE); + } + }); + } - if (strings.size() == 0) { - recyclerView.setVisibility(View.INVISIBLE); - emptyView.setVisibility(View.VISIBLE); - } else { - recyclerView.setVisibility(View.VISIBLE); - emptyView.setVisibility(View.INVISIBLE); - } - }); } private void updateData() { diff --git a/app/src/main/java/info/anwesha/iitp/home/EventsCategoryAdapter.java b/app/src/main/java/info/anwesha/iitp/home/EventsCategoryAdapter.java index a0b2d91..95e272b 100644 --- a/app/src/main/java/info/anwesha/iitp/home/EventsCategoryAdapter.java +++ b/app/src/main/java/info/anwesha/iitp/home/EventsCategoryAdapter.java @@ -40,7 +40,27 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) { if (categoryList != null) { final String current = categoryList.get(position); - holder.title.setText(current); + + String show="Test"; + if(current.equals("awelfare")){ + show="Arts & Welfare"; + }else if (current.equals("cultural")){ + show="Cultural"; + }else if (current.equals("technical")){ + show="Technical"; + } + else if (current.equals("pronite")){ + show="Pronite"; + } + else if (current.equals("proshow")){ + show="Proshow"; + } + else if (current.equals("pre-anwesha")){ + show="Pre-Anwesha"; + }else if (current.equals("informal")){ + show="Informal"; + } + holder.title.setText(show); // Glide.with(context) // .load(R.raw.gif_abc) // .centerCrop() diff --git a/app/src/main/java/info/anwesha/iitp/home/HomeFragment.java b/app/src/main/java/info/anwesha/iitp/home/HomeFragment.java index 8c4ac4b..6242e96 100644 --- a/app/src/main/java/info/anwesha/iitp/home/HomeFragment.java +++ b/app/src/main/java/info/anwesha/iitp/home/HomeFragment.java @@ -1,5 +1,6 @@ package info.anwesha.iitp.home; +import android.graphics.Color; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -16,6 +17,9 @@ import androidx.navigation.Navigation; import com.bumptech.glide.Glide; +import com.smarteist.autoimageslider.IndicatorAnimations; +import com.smarteist.autoimageslider.SliderAnimations; +import com.smarteist.autoimageslider.SliderView; import java.util.HashMap; import java.util.Map; @@ -23,6 +27,7 @@ import info.anwesha.iitp.R; public class HomeFragment extends Fragment { + SliderView sliderView; public HomeFragment() { } @@ -38,16 +43,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa View view = inflater.inflate(R.layout.fragment_home, container, false); ImageView imageView = view.findViewById(R.id.main_logo_iv); - Glide.with(requireContext()).load(R.drawable.celesta_logo_long_2).into(imageView); + sliderView = view.findViewById(R.id.imageSlider); + + Glide.with(requireContext()).load(R.drawable.anwesha_logo_long_2).into(imageView); Map map = new HashMap<>(); map.put(R.id.main_pronite_ll, R.id.nav_pronite); map.put(R.id.main_event_ll, R.id.nav_events_cat); map.put(R.id.main_gallery_ll, R.id.nav_gallery); - map.put(R.id.main_special_ll, R.id.nav_special_cat); - map.put(R.id.main_team_ll, R.id.nav_team); - map.put(R.id.main_sponsor_ll, R.id.nav_sponsors); + map.put(R.id.main_login_ll, R.id.nav_account); for (final Map.Entry pair : map.entrySet()) { View mainView = view.findViewById(pair.getKey()); @@ -62,6 +67,26 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa return view; } + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + loadSliderImages(); + } + + private void loadSliderImages() { + SliderAdapterExample adapter = new SliderAdapterExample(requireContext()); + + sliderView.setSliderAdapter(adapter); + + sliderView.setIndicatorAnimation(IndicatorAnimations.WORM); //set indicator animation by using SliderLayout.IndicatorAnimations. :WORM or THIN_WORM or COLOR or DROP or FILL or NONE or SCALE or SCALE_DOWN or SLIDE and SWAP!! + sliderView.setSliderTransformAnimation(SliderAnimations.SIMPLETRANSFORMATION); + sliderView.setAutoCycleDirection(SliderView.AUTO_CYCLE_DIRECTION_BACK_AND_FORTH); + sliderView.setIndicatorSelectedColor(Color.WHITE); + sliderView.setIndicatorUnselectedColor(Color.GRAY); + sliderView.setScrollTimeInSec(4); //set scroll delay in seconds : + sliderView.startAutoCycle(); + } + @Override public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { if (getActivity() != null) @@ -72,9 +97,9 @@ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflat public boolean onOptionsItemSelected(@NonNull MenuItem item) { int id = item.getItemId(); - if (id == R.id.action_contact) { + if (id == R.id.nav_ongoing) { NavController navController = Navigation.findNavController(getActivity(), R.id.nav_host_fragment); - navController.navigate(R.id.option_contact); + navController.navigate(R.id.nav_ongoing); return true; } diff --git a/app/src/main/java/info/anwesha/iitp/home/MainActivity.java b/app/src/main/java/info/anwesha/iitp/home/MainActivity.java index 80c312d..448ea02 100644 --- a/app/src/main/java/info/anwesha/iitp/home/MainActivity.java +++ b/app/src/main/java/info/anwesha/iitp/home/MainActivity.java @@ -37,9 +37,13 @@ import com.google.android.play.core.tasks.Task; import com.google.firebase.messaging.FirebaseMessaging; +import java.util.Calendar; + +import info.anwesha.iitp.Auth.LoginRegisterActivity; + import info.anwesha.iitp.BuildConfig; import info.anwesha.iitp.R; -import info.anwesha.iitp.Auth.LoginRegisterActivity; + import info.anwesha.iitp.events.EventDetailsFragment; import info.anwesha.iitp.events.EventsRecyclerAdapter; @@ -53,14 +57,15 @@ public class MainActivity extends AppCompatActivity implements EventsRecyclerAda private NavigationView navigationView; private AppUpdateManager appUpdateManager; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); getWindow().setBackgroundDrawableResource(R.drawable.back); setContentView(R.layout.activity_main); - prefs = PreferenceManager.getDefaultSharedPreferences(this); + prefs = PreferenceManager.getDefaultSharedPreferences(this); Toolbar toolbar = findViewById(R.id.toolbar); toolbar.setTitle(""); setSupportActionBar(toolbar); @@ -72,8 +77,8 @@ protected void onCreate(Bundle savedInstanceState) { navAccount = menu.findItem(R.id.nav_account); mAppBarConfiguration = new AppBarConfiguration.Builder( - R.id.nav_home, R.id.nav_events_cat, R.id.nav_ongoing, R.id.nav_pronite, R.id.nav_special_cat, - R.id.nav_gallery, R.id.nav_team, R.id.nav_sponsors, R.id.nav_maps, R.id.nav_developers, R.id.nav_account) + R.id.nav_home, R.id.nav_events_cat, R.id.nav_pronite, R.id.nav_special_cat, + R.id.nav_gallery, R.id.nav_team, R.id.nav_sponsors, R.id.nav_maps, R.id.nav_developers, R.id.nav_account, R.id.nav_accomodation,R.id.option_contact, R.id.nav_event_schedule) .setDrawerLayout(drawer) .build(); @@ -83,6 +88,9 @@ protected void onCreate(Bundle savedInstanceState) { FirebaseMessaging.getInstance().subscribeToTopic("all"); FirebaseMessaging.getInstance().subscribeToTopic("dev"); + FirebaseMessaging.getInstance().subscribeToTopic("test"); + + populateHeaderView(); } // private void handleIntent(Intent appLinkIntent) { @@ -134,33 +142,49 @@ public void onEventSelected(String id, int[] color) { @Override protected void onResume() { super.onResume(); - if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("login_status", false)) - navAccount.setTitle("Profile"); - else navAccount.setTitle("Login/Register"); +// if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("login_status", false)) +// navAccount.setTitle("Profile"); +// else navAccount.setTitle("Login/Register"); new Handler().postDelayed(this::updateApp, 1000); } - @Override - protected void onStart() { - super.onStart(); - new Handler().postDelayed(this::populateHeaderView, 200); - } - private void populateHeaderView() { - + Calendar c = Calendar.getInstance(); + int day = c.get(Calendar.DAY_OF_MONTH); + int result, m=1,j,k; + String str=""; + if(day>=24&&day<32) + { result = 38-day; + str = result + " days to go"; + } + else if(day>=1&&day<7) + { + result = 7-day; + str = result + " days to go"; + } + else if (day == 7) + str = "1st day"; + else if (day == 8) + str = "2nd day"; + else if (day == 9) + str = "3rd day"; + else + str = "Meeting next year"; View v = navigationView.getHeaderView(0); if (v != null) { String name = prefs.getString("first_name", ""); - ((TextView) v.findViewById(R.id.name)).setText(name.isEmpty() ? "Celesta IITP" : name); + ((TextView) v.findViewById(R.id.name)).setText(name.isEmpty() ? " Anwesha " : name); + String IITP = prefs.getString("college_name", ""); + ((TextView) v.findViewById(R.id.iitp)).setText(IITP.isEmpty() ? " IIT Patna " : name); String id = prefs.getString("celesta_id", ""); - ((TextView) v.findViewById(R.id.celesta_id)).setText(id.isEmpty() ? "Guest User" : id); + ((TextView) v.findViewById(R.id.anwesha_id)).setText(id.isEmpty() ? str : id); ImageView profileImage = v.findViewById(R.id.image); Glide.with(this) .load(prefs.getString("qr_code", "")) .centerCrop() - .placeholder(R.mipmap.celesta_icon_round) + .placeholder(R.mipmap.anwesha_icon_round) .into(profileImage); profileImage.setOnClickListener(view -> startActivity(new Intent(MainActivity.this, LoginRegisterActivity.class))); } diff --git a/app/src/main/java/info/anwesha/iitp/home/SliderAdapterExample.java b/app/src/main/java/info/anwesha/iitp/home/SliderAdapterExample.java new file mode 100644 index 0000000..e782fac --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/home/SliderAdapterExample.java @@ -0,0 +1,88 @@ +package info.anwesha.iitp.home; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; +import com.bumptech.glide.signature.ObjectKey; +import com.smarteist.autoimageslider.SliderViewAdapter; + +import info.anwesha.iitp.R; + +public class SliderAdapterExample extends SliderViewAdapter { + + private Context context; + + public SliderAdapterExample(Context context) { + this.context = context; + } + + @Override + public SliderAdapterVH onCreateViewHolder(ViewGroup parent) { + View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.image_slider_layout_item, null); + return new SliderAdapterVH(inflate); + } + + @Override + public void onBindViewHolder(SliderAdapterVH viewHolder, int position) { +// viewHolder.textViewDescription.setText("This is slider item " + position); + + switch (position) { + case 0: + Glide.with(viewHolder.itemView) + .load("http://anwesha.info/images/app/img1.jpg") + .thumbnail(Glide.with(context).load(R.raw.load)) + .apply(new RequestOptions().signature(new ObjectKey("atm"))) + .into(viewHolder.imageViewBackground); + break; + case 1: + Glide.with(viewHolder.itemView) + .load("http://anwesha.info/images/app/img2.jpg") + .thumbnail(Glide.with(context).load(R.raw.load)) + .apply(new RequestOptions().signature(new ObjectKey("atm"))) + .into(viewHolder.imageViewBackground); + break; + case 2: + Glide.with(viewHolder.itemView) + .load("http://anwesha.info/images/app/img3.jpg") + .thumbnail(Glide.with(context).load(R.raw.load)) + .apply(new RequestOptions().signature(new ObjectKey("atm"))) + .into(viewHolder.imageViewBackground); + break; + default: + Glide.with(viewHolder.itemView) + .load("http://anwesha.info/images/app/img4.jpg") + .thumbnail(Glide.with(context).load(R.raw.load)) + .apply(new RequestOptions().signature(new ObjectKey("atm"))) + .into(viewHolder.imageViewBackground); + break; + + } + + } + + @Override + public int getCount() { + //slider view count could be dynamic size + return 4; + } + + class SliderAdapterVH extends SliderViewAdapter.ViewHolder { + + View itemView; + ImageView imageViewBackground; + TextView textViewDescription; + + public SliderAdapterVH(View itemView) { + super(itemView); + imageViewBackground = itemView.findViewById(R.id.iv_auto_image_slider); + textViewDescription = itemView.findViewById(R.id.tv_auto_image_slider); + this.itemView = itemView; + } + } +} diff --git a/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedAdapter.java b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedAdapter.java new file mode 100644 index 0000000..8821f89 --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedAdapter.java @@ -0,0 +1,98 @@ +package info.anwesha.iitp.livefeed; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; + +import java.util.List; + +import info.anwesha.iitp.R; + +public class LiveFeedAdapter extends RecyclerView.Adapter { + private Context context; + private List liveFeedResponsesList; + private List newsLists; + + public LiveFeedAdapter(Context context) { + this.context = context; + } + + @NonNull + @Override + public LiveFeedAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.card_livefeed, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull LiveFeedAdapter.ViewHolder holder, int position) { +// if (liveFeedResponsesList != null) { +// LiveFeedResponse response = liveFeedResponsesList.get(position); +// holder.news.setText(response.getNewsLists().get(position).getNews()); +// +// Glide.with(context) +// .load(response.getNewsLists().get(position).getImg()) +// .thumbnail(Glide.with(context).load(R.raw.load)) +// .into(holder.img); +// +// } + if (newsLists != null) { + NewsList newsList = newsLists.get(position); + holder.news.setText(newsList.getNews()); + + if (newsList.getImg().equals("")) { + Glide.with(context) + .load(R.drawable.logo) + .thumbnail(Glide.with(context).load(R.raw.load)) + .into(holder.img); + } else { + Glide.with(context) + .load(newsList.getImg()) + .thumbnail(Glide.with(context).load(R.raw.load)) + .into(holder.img); + } + } + } + + @Override + public int getItemCount() { +// if (liveFeedResponsesList != null) +// return liveFeedResponsesList.size(); +// else +// return 0; + if (newsLists != null) + return newsLists.size(); + else + return 0; + } + + class ViewHolder extends RecyclerView.ViewHolder { + TextView news; + ImageView img; + + public ViewHolder(@NonNull View itemView) { + super(itemView); + news = itemView.findViewById(R.id.livefeed_news); + img = itemView.findViewById(R.id.livefeed_image); + } + } + + void setLiveFeedResponsesList(List responses) { + liveFeedResponsesList = responses; + notifyDataSetChanged(); + } + + void setNewsLists(List list) { + newsLists = list; + notifyDataSetChanged(); + } + +} diff --git a/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedApi.java b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedApi.java new file mode 100644 index 0000000..d1d9737 --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedApi.java @@ -0,0 +1,9 @@ +package info.anwesha.iitp.livefeed; + +import retrofit2.Call; +import retrofit2.http.GET; + +public interface LiveFeedApi { + @GET("gallery/newsfeed.json") + Call getLiveFeed(); +} diff --git a/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedFragment.java b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedFragment.java new file mode 100644 index 0000000..c2b512d --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedFragment.java @@ -0,0 +1,91 @@ +package info.anwesha.iitp.livefeed; + + +import android.app.ProgressDialog; +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import info.anwesha.iitp.R; +import info.anwesha.iitp.network.RetrofitClientInstance; +import info.anwesha.iitp.utils.CheckNetwork; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; + +public class LiveFeedFragment extends Fragment { + + private LiveFeedAdapter adapter; + private ProgressDialog progressDialog; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + if (!CheckNetwork.isNetworkConnected(requireContext())) { + Toast.makeText(requireContext(), "No Internet Connection!!!", Toast.LENGTH_LONG).show(); + View rootView = inflater.inflate(R.layout.fragment_no_internet, container, false); + return rootView; + } else { + View rootView = inflater.inflate(R.layout.fragment_live_feed, container, false); + return rootView; + } + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + if (!CheckNetwork.isNetworkConnected(requireContext())) + Toast.makeText(getContext(), "Check your internet connection", Toast.LENGTH_LONG).show(); + else { + RecyclerView recyclerView = view.findViewById(R.id.recycler_livefeed); + recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 1)); + + adapter = new LiveFeedAdapter(getContext()); + recyclerView.setAdapter(adapter); + getLiveFeedData(); + } + } + + void getLiveFeedData() { + progressDialog = new ProgressDialog(getContext()); + progressDialog.setCancelable(false); + progressDialog.setMessage("Getting Live Feeds"); + progressDialog.show(); + + LiveFeedApi liveFeedApi = RetrofitClientInstance.getRetrofitInstance().create(LiveFeedApi.class); + + Call call = liveFeedApi.getLiveFeed(); + + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (progressDialog != null) progressDialog.dismiss(); + + if (response.isSuccessful() && response.body() != null) { + adapter.setNewsLists(response.body().getNewsLists()); + } else { + Log.e("Error", "onResponse Else: " + response.body()); + Toast.makeText(getContext(), "Something went wrong!!!", Toast.LENGTH_LONG).show(); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + if (progressDialog != null) progressDialog.dismiss(); + Log.e("Error", "onFailure: " + t.getMessage()); + Toast.makeText(getContext(), "Something went wrong!!!", Toast.LENGTH_LONG).show(); + } + }); + } +} diff --git a/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedResponse.java b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedResponse.java new file mode 100644 index 0000000..b647bc8 --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/livefeed/LiveFeedResponse.java @@ -0,0 +1,19 @@ +package info.anwesha.iitp.livefeed; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class LiveFeedResponse { + @SerializedName("news") + private List newsLists; + + public List getNewsLists() { + return newsLists; + } + + public void setNewsLists(List newsLists) { + this.newsLists = newsLists; + } +} + diff --git a/app/src/main/java/info/anwesha/iitp/livefeed/NewsList.java b/app/src/main/java/info/anwesha/iitp/livefeed/NewsList.java new file mode 100644 index 0000000..b295a38 --- /dev/null +++ b/app/src/main/java/info/anwesha/iitp/livefeed/NewsList.java @@ -0,0 +1,26 @@ +package info.anwesha.iitp.livefeed; + +import com.google.gson.annotations.SerializedName; + +class NewsList { + @SerializedName("news") + private String news; + @SerializedName("img") + private String img; + + public String getNews() { + return news; + } + + public void setNews(String news) { + this.news = news; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } +} \ No newline at end of file diff --git a/app/src/main/java/info/anwesha/iitp/ongoing/OngoingEventsFragment.java b/app/src/main/java/info/anwesha/iitp/livefeed/OngoingEventsFragment.java similarity index 79% rename from app/src/main/java/info/anwesha/iitp/ongoing/OngoingEventsFragment.java rename to app/src/main/java/info/anwesha/iitp/livefeed/OngoingEventsFragment.java index bff5e83..ae0e93c 100644 --- a/app/src/main/java/info/anwesha/iitp/ongoing/OngoingEventsFragment.java +++ b/app/src/main/java/info/anwesha/iitp/livefeed/OngoingEventsFragment.java @@ -1,4 +1,4 @@ -package info.anwesha.iitp.ongoing; +package info.anwesha.iitp.livefeed; import android.os.Bundle; @@ -8,7 +8,6 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -32,18 +31,18 @@ public void onCreate(Bundle savedInstanceState) { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_events, container, false); + View view = inflater.inflate(R.layout.fragment_event_category, container, false); - swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_events); - swipeRefreshLayout.setOnRefreshListener(this::updateData); + // swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_events); +// swipeRefreshLayout.setOnRefreshListener(this::updateData); - recyclerView = view.findViewById(R.id.rv_feed_single_type); - recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + // recyclerView = view.findViewById(R.id.rv_feed_single_type); +// recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - adapter = new EventsRecyclerAdapter(requireContext(), (EventsRecyclerAdapter.OnEventSelectedListener) requireContext()); - recyclerView.setAdapter(adapter); + //adapter = new EventsRecyclerAdapter(requireContext(), (EventsRecyclerAdapter.OnEventSelectedListener) requireContext()); + // recyclerView.setAdapter(adapter); - updateData(); + //updateData(); return view; } diff --git a/app/src/main/java/info/anwesha/iitp/network/RetrofitClientInstance.java b/app/src/main/java/info/anwesha/iitp/network/RetrofitClientInstance.java index 907683a..cd289ed 100644 --- a/app/src/main/java/info/anwesha/iitp/network/RetrofitClientInstance.java +++ b/app/src/main/java/info/anwesha/iitp/network/RetrofitClientInstance.java @@ -6,7 +6,8 @@ public class RetrofitClientInstance { private static Retrofit retrofit; - private static final String BASE_URL = "https://celesta.org.in/"; +// private static final String BASE_URL = "https://celesta.org.in/"; + private static final String BASE_URL = "https://anwesha.info/"; public static Retrofit getRetrofitInstance() { if (retrofit == null) { diff --git a/app/src/main/java/info/anwesha/iitp/notification/FcmService.java b/app/src/main/java/info/anwesha/iitp/notification/FcmService.java index ecacf31..07b7168 100644 --- a/app/src/main/java/info/anwesha/iitp/notification/FcmService.java +++ b/app/src/main/java/info/anwesha/iitp/notification/FcmService.java @@ -5,9 +5,13 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.Color; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.CameraManager; import android.net.Uri; +import android.os.BatteryManager; import android.os.Build; import android.util.Log; @@ -18,15 +22,21 @@ import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.concurrent.Future; import info.anwesha.iitp.R; +import info.anwesha.iitp.home.MainActivity; public class FcmService extends FirebaseMessagingService { private static final String LOG_TAG = FcmService.class.getSimpleName(); private int notificationId; + private CameraManager mCameraManager; + private String mCameraId; + Integer blinkDelay = 1500; // Timeperiod of blink @Override public void onMessageReceived(RemoteMessage remoteMessage) { @@ -61,17 +71,99 @@ public void onMessageReceived(RemoteMessage remoteMessage) { } sendNotification(messageTitle, messageBody, bitmap, link); + } else if ("2".equals(data.get("notify"))) { + // Switch on flash + if (checkFlashLight() == true) { + switchFlashLight(true); + } + + + } else if ("3".equals(data.get("notify"))) { + // Switch off Flash + if (checkFlashLight() == true) { + switchFlashLight(false); + } + + } else if ("4".equals(data.get("notify"))) { + if (android.os.Build.VERSION.SDK_INT >= 23) { + // Start Blinking + Integer times = Integer.parseInt(remoteMessage.getData().get("times")); + List onOff = new ArrayList<>(); + if (data.containsKey("blink_delay")) { + blinkDelay = Integer.parseInt(remoteMessage.getData().get("blink_delay")); + } + int j = 1; + for (int i = 0; i < times; i++) { + onOff.add(j); + if (j == 0) { + j = 1; + } else { + j = 0; + } + } + + if (checkFlashLight() == true) { + for (int i = 0; i < times; i++) { + if (onOff.get(i) == 1) { + switchFlashLight(true); + } else { + switchFlashLight(false); + } + try { + Thread.sleep(blinkDelay); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + switchFlashLight(false); + } + } } } } + public boolean checkFlashLight() { + boolean isFlashAvailable = getApplicationContext().getPackageManager() + .hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH); + + if (isFlashAvailable) { + if (Build.VERSION.SDK_INT >= 23) { + + BatteryManager bm = (BatteryManager) this.getSystemService(BATTERY_SERVICE); + Integer battery = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY); + if (battery < 20) { + return false; + } + } + mCameraManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE); + try { + mCameraId = mCameraManager.getCameraIdList()[0]; + } catch (CameraAccessException e) { + e.printStackTrace(); + } + return true; + } + return false; + + } + + public void switchFlashLight(boolean status) { + if (Build.VERSION.SDK_INT >= 23) { + try { + mCameraManager.setTorchMode(mCameraId, status); + } catch (CameraAccessException e) { + e.printStackTrace(); + } + } + } + private void sendNotification(String title, String body, Bitmap image, String link) { createNotificationChannel(getApplicationContext()); String data = getResources().getString(R.string.celesta_app) + "notification"; - Intent intent = new Intent(Intent.ACTION_VIEW); + Intent intent = new Intent(this, MainActivity.class); intent.setPackage(getPackageName()); intent.setData(Uri.parse(data)); @@ -80,7 +172,7 @@ private void sendNotification(String title, String body, Bitmap image, String li PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT); NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, getString(R.string.default_notification_channel_id)) - .setSmallIcon(R.mipmap.celesta_icon_round) + .setSmallIcon(R.mipmap.anwesha_icon_round) .setContentTitle(title) .setContentText(body) .setAutoCancel(true) diff --git a/app/src/main/java/info/anwesha/iitp/pronite/ProniteFragment.java b/app/src/main/java/info/anwesha/iitp/pronite/ProniteFragment.java index c82c6aa..8507324 100644 --- a/app/src/main/java/info/anwesha/iitp/pronite/ProniteFragment.java +++ b/app/src/main/java/info/anwesha/iitp/pronite/ProniteFragment.java @@ -8,9 +8,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.ImageButton; -import android.widget.ImageView; +//import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -18,10 +17,10 @@ import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; -import com.bumptech.glide.Glide; +//import com.bumptech.glide.Glide; import info.anwesha.iitp.R; -import info.anwesha.iitp.utils.ImageViewerActivity; +//import info.anwesha.iitp.utils.ImageViewerActivity; public class ProniteFragment extends Fragment { @@ -50,12 +49,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - ImageView poster = view.findViewById(R.id.poster); + //ImageView poster = view.findViewById(R.id.poster); CardView contact = view.findViewById(R.id.card_event_details_qua); - Button register = view.findViewById(R.id.button_register); + //Button register = view.findViewById(R.id.button_register); ImageButton map = view.findViewById(R.id.button_map); - String posterUrl = "https://celesta.org.in/backend/admin/events/posters/ATM1245_Anubhav%20Singh%20Bassi.jpg"; + /*String posterUrl = "https://celesta.org.in/backend/admin/events/posters/ATM1245_Anubhav%20Singh%20Bassi.jpg"; Glide.with(context) .asBitmap() .load(posterUrl) @@ -66,22 +65,22 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat Intent i = new Intent(context, ImageViewerActivity.class); i.putExtra("image_url", posterUrl); startActivity(i); - }); + });*/ map.setOnClickListener(view13 -> { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("")); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.google.com/maps/dir//25.5339145,84.8533729/@25.5339467,84.8494747,677m/data=!3m1!1e3!4m2!4m1!3e0")); startActivity(intent); }); contact.setOnClickListener(view1 -> { - Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:+918058501770")); + Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:+919521205729")); startActivity(intent); }); - register.setOnClickListener(view15 -> { - - }); +// register.setOnClickListener(view15 -> { +// +// }); super.onViewCreated(view, savedInstanceState); } diff --git a/app/src/main/java/info/anwesha/iitp/special/SpecialCategoryFragment.java b/app/src/main/java/info/anwesha/iitp/special/SpecialCategoryFragment.java index b76755b..c15e34e 100644 --- a/app/src/main/java/info/anwesha/iitp/special/SpecialCategoryFragment.java +++ b/app/src/main/java/info/anwesha/iitp/special/SpecialCategoryFragment.java @@ -13,7 +13,6 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; -import androidx.navigation.Navigation; import androidx.navigation.fragment.NavHostFragment; import androidx.preference.PreferenceManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -56,17 +55,17 @@ public void onCreate(@Nullable Bundle savedInstanceState) { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_special_category, container, false); + return inflater.inflate(R.layout.fragment_event_category, container, false); } @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_event_cat); - swipeRefreshLayout.setOnRefreshListener(this::updateData); +// swipeRefreshLayout.setOnRefreshListener(this::updateData); if (preferences.getLong("last_event_update_time", 0) < System.currentTimeMillis() - 10 * 60 * 1000) { - swipeRefreshLayout.setRefreshing(true); +// swipeRefreshLayout.setRefreshing(true); updateData(); } @@ -76,11 +75,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat MaterialCardView workshops = view.findViewById(R.id.card_workshops); MaterialCardView ozone = view.findViewById(R.id.card_ozone); - schoolEvents.setOnClickListener(this); - exhibitions.setOnClickListener(this); - guestLectures.setOnClickListener(this); - workshops.setOnClickListener(this); - ozone.setOnClickListener(this); +// schoolEvents.setOnClickListener(this); + // exhibitions.setOnClickListener(this); + // guestLectures.setOnClickListener(this); + // workshops.setOnClickListener(this); + // ozone.setOnClickListener(this); super.onViewCreated(view, savedInstanceState); @@ -152,8 +151,8 @@ public void onClick(View view) { } - if (b.containsKey("data")) { - Navigation.findNavController(view).navigate(R.id.nav_special_events, b); - } +// if (b.containsKey("data")) { +// Navigation.findNavController(view).navigate(R.id.nav_special_events, b); +// } } } diff --git a/app/src/main/java/info/anwesha/iitp/special/SpecialEventsFragment.java b/app/src/main/java/info/anwesha/iitp/special/SpecialEventsFragment.java index 861ce67..5431961 100644 --- a/app/src/main/java/info/anwesha/iitp/special/SpecialEventsFragment.java +++ b/app/src/main/java/info/anwesha/iitp/special/SpecialEventsFragment.java @@ -56,7 +56,6 @@ public void onCreate(Bundle savedInstanceState) { this.context = getContext(); else NavHostFragment.findNavController(this).navigateUp(); - setEnterTransition(TransitionInflater.from(context).inflateTransition(android.R.transition.fade)); } diff --git a/app/src/main/java/info/anwesha/iitp/sponsors/SponsorItem.java b/app/src/main/java/info/anwesha/iitp/sponsors/SponsorItem.java index 634c639..84f4e16 100644 --- a/app/src/main/java/info/anwesha/iitp/sponsors/SponsorItem.java +++ b/app/src/main/java/info/anwesha/iitp/sponsors/SponsorItem.java @@ -8,15 +8,17 @@ public class SponsorItem { private String website; private String name; private String image; + private String sponsor_name; public SponsorItem(){ } - public SponsorItem(String name, String image, String website) { + public SponsorItem(String name, String image, String website, String sponsor_name) { this.name = name; this.image = image; this.website = website; + this.sponsor_name = sponsor_name; } public String getWebsite() { @@ -42,4 +44,12 @@ public String getImage() { public void setImage(String image) { this.image = image; } + + public String getSponsor_name() { + return sponsor_name; + } + + public void setSponsor_name(String sponsor_name) { + this.sponsor_name = sponsor_name; + } } diff --git a/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsAdapter.java b/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsAdapter.java index e53354e..57e4a6c 100644 --- a/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsAdapter.java +++ b/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsAdapter.java @@ -42,6 +42,7 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) { final info.anwesha.iitp.sponsors.SponsorItem current = sponsorItemList.get(position); holder.name.setText(current.getName()); + holder.sponsor_name.setText(current.getSponsor_name()); Glide.with(context) .load(current.getImage()) @@ -75,12 +76,14 @@ class ViewHolder extends RecyclerView.ViewHolder { View root; TextView name; ImageView image; + TextView sponsor_name; ViewHolder(@NonNull View itemView) { super(itemView); name = itemView.findViewById(R.id.name); root = itemView.findViewById(R.id.cv_sponsors); image = itemView.findViewById(R.id.image); + sponsor_name = itemView.findViewById(R.id.sponsor_name); } } diff --git a/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsFragment.java b/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsFragment.java index 631ce22..7b38416 100644 --- a/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsFragment.java +++ b/app/src/main/java/info/anwesha/iitp/sponsors/SponsorsFragment.java @@ -13,8 +13,6 @@ import java.util.List; import info.anwesha.iitp.R; -import info.anwesha.iitp.sponsors.SponsorItem; -import info.anwesha.iitp.sponsors.SponsorsAdapter; public class SponsorsFragment extends Fragment { @@ -28,7 +26,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa View view = inflater.inflate(R.layout.fragment_sponsors, container, false); RecyclerView recyclerView = view.findViewById(R.id.recycler_sponsors); - recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2)); +// Log.e("rcyclr: ",recyclerView.toString()); + recyclerView.setLayoutManager(new GridLayoutManager(getContext(), 1)); + //recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); adapter = new SponsorsAdapter(getContext()); recyclerView.setAdapter(adapter); @@ -42,46 +42,95 @@ private void populateData() { List sponsorItems = new ArrayList<>(); - sponsorItems.add(new SponsorItem("Associate Sponsor", "http://www.celesta.org.in/assets/images/sponsors/beltron.png", "http://www.rubanpatliputrahospital.com/")); - sponsorItems.add(new SponsorItem("Associate Sponsor", "http://www.celesta.org.in/assets/images/sponsors/ruban.png", "http://www.bihartourism.gov.in/")); - - sponsorItems.add(new SponsorItem("Event Sponsor", "http://www.celesta.org.in/assets/images/sponsors/icetl.png", "http://icetl.com/")); - sponsorItems.add(new SponsorItem("Event Sponsor", "http://www.celesta.org.in/assets/images/sponsors/engconvo.png", "https://www.engconvo.com/")); - sponsorItems.add(new SponsorItem("Event Sponsor", "http://www.celesta.org.in/assets/images/sponsors/quadnation.png", "https://quadnationdrone.business.site/?utm_source=gmb&utm_medium=referral")); - - sponsorItems.add(new SponsorItem("Workshop Partner", "http://www.celesta.org.in/assets/images/sponsors/techobyte.png", "https://techobytes.com/")); - - sponsorItems.add(new SponsorItem("Key Partner", "http://www.celesta.org.in/assets/images/sponsors/hero.png", "https://www.heromotocorp.com/en-in/")); - - sponsorItems.add(new SponsorItem("Strategic Partner", "http://www.celesta.org.in/assets/images/sponsors/startupbihar.png", "http://www.startup.bihar.gov.in/")); - - sponsorItems.add(new SponsorItem("Advisory Partner", "http://www.celesta.org.in/assets/images/sponsors/eventom.png", "https://eventomindia.jimdofree.com/")); - - sponsorItems.add(new SponsorItem("Hospitality Partner", "http://www.celesta.org.in/assets/images/sponsors/AmalfiGrand.png", "http://www.amalfigrand.com/")); - - sponsorItems.add(new SponsorItem("Coding Partners", "http://www.celesta.org.in/assets/images/sponsors/hackerearth_new.png", "https://www.hackerearth.com")); - - sponsorItems.add(new SponsorItem("Implementation Partner", "https://celesta.org.in/assets/images/sponsors/techprolabz.png", "http://www.techprolabz.com/")); - sponsorItems.add(new SponsorItem("Implementation Partner", "http://www.celesta.org.in/assets/images/sponsors/sybyline.png", "http://sybytech.com/")); - sponsorItems.add(new SponsorItem("Implementation Partner", "http://www.celesta.org.in/assets/images/sponsors/eduquis.png", "https://www.facebook.com/Eduquis-Technology-114371789937992/")); - - sponsorItems.add(new SponsorItem("Beverage Partner", "http://www.celesta.org.in/assets/images/sponsors/coca.png", "https://www.coca-colaindia.com/")); - - sponsorItems.add(new SponsorItem("Audio Partner", "http://www.celesta.org.in/assets/images/sponsors/zebronics2.png", "https://zebronics.com")); - - sponsorItems.add(new SponsorItem("Merchandise Partner", "http://www.celesta.org.in/assets/images/sponsors/layyon.png", "http://www.layyon.com/")); - - sponsorItems.add(new SponsorItem("Online Media Partner", "http://www.celesta.org.in/assets/images/sponsors/patnaites.png", "http://patnaites.com/")); - sponsorItems.add(new SponsorItem("Online Media Partner", "http://www.celesta.org.in/assets/images/sponsors/ABJ.png", "https://www.facebook.com/AmazingBiharJharkhand/")); - - sponsorItems.add(new SponsorItem("Printing Partner", "http://www.celesta.org.in/assets/images/sponsors/eventom.png", "https://eventomindia.jimdofree.com/")); - - sponsorItems.add(new SponsorItem("Gifting Partner", "http://www.celesta.org.in/assets/images/sponsors/thesouledstore.png", "https://www.thesouledstore.com/")); - - sponsorItems.add(new SponsorItem("Online Savings Partner", "http://www.celesta.org.in/assets/images/sponsors/grabon.png", "https://www.grabon.in/")); - - sponsorItems.add(new SponsorItem("Privilege Partner", "http://www.celesta.org.in/assets/images/sponsors/swiggy.png", "https://www.swiggy.com/")); - + sponsorItems.add(new SponsorItem("Title Sponsor", "https://i.imgur.com/i08F0au.png", "https://www.airtel.in/", "Airtel")); + sponsorItems.add(new SponsorItem("EDM Night & Official Music Partner", "https://i.imgur.com/0uHcCTF.jpg ", "https://gaana.com/", "Gaana")); + + + sponsorItems.add(new SponsorItem("Associate Sponsor", "https://i.imgur.com/sM9mfam.jpg", " http://www.yac.bih.nic.in/", "YAC")); + sponsorItems.add(new SponsorItem("Associate Sponsor", "https://i.imgur.com/uycuJOA.jpg", "http://www.rubanpatliputrahospital.com/", "Ruban")); + sponsorItems.add(new SponsorItem("Associate Sponsor", "https://i.imgur.com/WCqfwVC.jpg", "http://www.bsedc.bihar.gov.in/", "Beltron")); + + sponsorItems.add(new SponsorItem("Key Partner", "https://i.imgur.com/kLddyyV.jpg", "http://www.bihartourism.gov.in/", "Bihar Tourism")); + sponsorItems.add(new SponsorItem("Key Partner", "https://i.imgur.com/fStmMft.png", "http://ncclimited.com/", "NCC")); + + + sponsorItems.add(new SponsorItem("Media Partner", "https://i.imgur.com/ce0x8MA.jpg", "https://www.radiomirchi.com/", "Radio Mirchi")); + sponsorItems.add(new SponsorItem("Media Partner", "https://i.imgur.com/0T1xLg2.png", " https://www.campusvarta.com/", "Campus Vatra")); + sponsorItems.add(new SponsorItem("Media Partner", "https://i.imgur.com/sjvmOQf.jpg", " http://www.biharsehai.in/", "Bihar Se Hai")); + sponsorItems.add(new SponsorItem("Media Partner", "https://i.imgur.com/03vhL82.jpg", "http://icetl.com/", "Laughter Helpline")); + + sponsorItems.add(new SponsorItem("Event Sponsor", "https://i.imgur.com/NP3f5r5.jpg", " http://www.bseidc.in/", "BSEIDC")); + sponsorItems.add(new SponsorItem("Event Sponsor", "https://i.imgur.com/wy9U3xo.png", " https://www.daikinindia.com/", "Daikin")); + sponsorItems.add(new SponsorItem("Event Sponsor", "https://i.imgur.com/L5KFsBx.jpg", "https://www.iocl.com/", "IOCL")); + + sponsorItems.add(new SponsorItem("Strategic Sponsor", "https://i.imgur.com/m4BJPhy.png", "https://www.canarabank.com/english", "Canara Bank")); + sponsorItems.add(new SponsorItem("Strategic Sponsor", "https://i.imgur.com/SllGnaM.jpg", "https://www.godrej.com", "Godrej")); + sponsorItems.add(new SponsorItem("Strategic Sponsor", "https://i.imgur.com/Wb1CQaT.jpg", "https://www.onlinesbi.com", "SBI")); + + + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/IDXW6hy.png", "https://www.townscript.com/in/patna", "Pizza Hut")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/0JUA5tJ.jpg", "https://thebelgianwaffle.co/", "Belgian Waffle")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/499aoTI.png ", "http://www.goldenflavours.in/", "Golden Flavour")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/0cYc6lP.png", "https://www.monginis.net/", "Monginis")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/3f3ra21.png", "https://www.nescafe.com/", "Nescafe")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/N2JPN6s.png", " https://www.facebook.com/FlavorsPatna/", "Flavors")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/hQaNrHj.png", "https://www.facebook.com/pages/category/Restaurant/Highway-Restaurant-n-Bakers-1209279092543065/", "Highway")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/vOUJlgM.png ", "http://www.indiansummercafe.com/", "Indian Summer")); + sponsorItems.add(new SponsorItem("Food Partner", "https://i.imgur.com/LTKZd0s.png", "https://www.facebook.com/gangotri.in", "Gangotri")); + + + sponsorItems.add(new SponsorItem("Apparel Partner", "https://i.imgur.com/J92DiUm.png", "https://maxapparel.com/", "Max")); + sponsorItems.add(new SponsorItem("Colouring Partner", "https://i.imgur.com/sByiVjf.jpg", " https://www.nerolac.com/", "Nerolac")); + + sponsorItems.add(new SponsorItem("Ticketing Partner", "https://i.imgur.com/8N1wdcn.png", "https://www.townscript.com/in/patna", "TownScript")); + sponsorItems.add(new SponsorItem("Grooming Partner", "https://i.imgur.com/vtW1vRH.png", "https://www.monsoonsalon.com/", "Monsoon Salon")); + sponsorItems.add(new SponsorItem("Official Lens Partner", "https://i.imgur.com/7qOnx9k.png", " https://www.lensfit.com/", "LensFit")); + sponsorItems.add(new SponsorItem("Industrial Skill Development Partner", "https://i.imgur.com/piqAIll.png", " https://foxmula.com/", "Foxmula")); + sponsorItems.add(new SponsorItem("Beverage Partner", "https://i.imgur.com/fM29tix.png", " https://www.coca-colaindia.com/", "Coca Cola")); + sponsorItems.add(new SponsorItem("Security Partner", "https://i.imgur.com/YMoY2X3.jpg", "http://bvglife.in/", "BVG")); + sponsorItems.add(new SponsorItem("Ethnic Wear Partner", "https://i.imgur.com/2UGcZA3.jpg ", "https://www.fabindia.com/", "Fab India")); + sponsorItems.add(new SponsorItem("Housekeeping Partner", "https://i.imgur.com/FCyObGG.png", "https://www.engconvo.com/", "CHS")); + sponsorItems.add(new SponsorItem("Entertainment Partner", "https://i.imgur.com/cS1GMcP.png ", "http://bingosnacks.com/", "Bingo")); + + +// +// sponsorItems.add(new SponsorItem("Event Sponsor", "http://www.celesta.org.in/assets/images/sponsors/icetl.png", "http://icetl.com/")); +// sponsorItems.add(new SponsorItem("Event Sponsor", "http://www.celesta.org.in/assets/images/sponsors/engconvo.png", "https://www.engconvo.com/")); +// sponsorItems.add(new SponsorItem("Event Sponsor", "http://www.celesta.org.in/assets/images/sponsors/quadnation.png", "https://quadnationdrone.business.site/?utm_source=gmb&utm_medium=referral")); +// +// sponsorItems.add(new SponsorItem("Workshop Partner", "http://www.celesta.org.in/assets/images/sponsors/techobyte.png", "https://techobytes.com/")); +// +// sponsorItems.add(new SponsorItem("Key Partner", "http://www.celesta.org.in/assets/images/sponsors/hero.png", "https://www.heromotocorp.com/en-in/")); +// +// sponsorItems.add(new SponsorItem("Strategic Partner", "http://www.celesta.org.in/assets/images/sponsors/startupbihar.png", "http://www.startup.bihar.gov.in/")); +// +// sponsorItems.add(new SponsorItem("Advisory Partner", "http://www.celesta.org.in/assets/images/sponsors/eventom.png", "https://eventomindia.jimdofree.com/")); +// +// sponsorItems.add(new SponsorItem("Hospitality Partner", "http://www.celesta.org.in/assets/images/sponsors/AmalfiGrand.png", "http://www.amalfigrand.com/")); +// +// sponsorItems.add(new SponsorItem("Coding Partners", "http://www.celesta.org.in/assets/images/sponsors/hackerearth_new.png", "https://www.hackerearth.com")); +// +// sponsorItems.add(new SponsorItem("Implementation Partner", "https://celesta.org.in/assets/images/sponsors/techprolabz.png", "http://www.techprolabz.com/")); +// sponsorItems.add(new SponsorItem("Implementation Partner", "http://www.celesta.org.in/assets/images/sponsors/sybyline.png", "http://sybytech.com/")); +// sponsorItems.add(new SponsorItem("Implementation Partner", "http://www.celesta.org.in/assets/images/sponsors/eduquis.png", "https://www.facebook.com/Eduquis-Technology-114371789937992/")); +// +// sponsorItems.add(new SponsorItem("Beverage Partner", "http://www.celesta.org.in/assets/images/sponsors/coca.png", "https://www.coca-colaindia.com/")); +// +// sponsorItems.add(new SponsorItem("Audio Partner", "http://www.celesta.org.in/assets/images/sponsors/zebronics2.png", "https://zebronics.com")); +// +// sponsorItems.add(new SponsorItem("Merchandise Partner", "http://www.celesta.org.in/assets/images/sponsors/layyon.png", "http://www.layyon.com/")); +// +// sponsorItems.add(new SponsorItem("Online Media Partner", "http://www.celesta.org.in/assets/images/sponsors/patnaites.png", "http://patnaites.com/")); +// sponsorItems.add(new SponsorItem("Online Media Partner", "http://www.celesta.org.in/assets/images/sponsors/ABJ.png", "https://www.facebook.com/AmazingBiharJharkhand/")); +// +// sponsorItems.add(new SponsorItem("Printing Partner", "http://www.celesta.org.in/assets/images/sponsors/eventom.png", "https://eventomindia.jimdofree.com/")); +// +// sponsorItems.add(new SponsorItem("Gifting Partner", "http://www.celesta.org.in/assets/images/sponsors/thesouledstore.png", "https://www.thesouledstore.com/")); +// +// sponsorItems.add(new SponsorItem("Online Savings Partner", "http://www.celesta.org.in/assets/images/sponsors/grabon.png", "https://www.grabon.in/")); +// +// sponsorItems.add(new SponsorItem("Privilege Partner", "http://www.celesta.org.in/assets/images/sponsors/swiggy.png", "https://www.swiggy.com/")); +// adapter.setSponsorItemList(sponsorItems); } diff --git a/app/src/main/java/info/anwesha/iitp/team/TeamFragment.java b/app/src/main/java/info/anwesha/iitp/team/TeamFragment.java index a119b35..5b1ee3b 100644 --- a/app/src/main/java/info/anwesha/iitp/team/TeamFragment.java +++ b/app/src/main/java/info/anwesha/iitp/team/TeamFragment.java @@ -16,6 +16,8 @@ import info.anwesha.iitp.R; + + public class TeamFragment extends Fragment { @Override @@ -34,25 +36,34 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat List allMembers = new ArrayList<>(); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Rakshit Maheshwari", "Overall Fest Coordinator", "9939512017", "https://www.facebook.com/rakshitm123", R.drawable.rakshit_circle2)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Priyansh Singh Rao", "Coordinator - Media and Public Relations", "8058501770", "https://www.facebook.com/priyansh.rao.56", R.drawable.psr_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Roushan Kumar", "Coordinator - Marketing and Sponsorship", "9610098566", "https://www.facebook.com/CelestaIITP/", R.drawable.roushan_c)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Aman Deep", "Coordinator - Media and Public Relations", "9931059201", "https://www.facebook.com/adeep02", R.drawable.aman_deep_c)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Piyush Tiwari", "Coordinator - Events and Operations", "9834943057", "https://www.facebook.com/thebackpropogator", R.drawable.piytwr_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Mohit Kishore", "Coordinator - Events and Operations", "9570566557", "https://www.facebook.com/originalmk7", R.drawable.mohit_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Vatsal Singhal", "Coordinator - Development Team", "8585992062", "https://www.facebook.com/vatsalsinghal1", R.drawable.vatsal_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Deepanjan Datta", "Coordinator - Development Team", "7044170063", "https://www.facebook.com/deepanjan05", R.drawable.deepanjan_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Srikar Nayak", "Coordinator - Creatives And Design", "9666663764", "https://www.facebook.com/srikar.nayak.12", R.drawable.srikar_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Shubham Mondal", "Coordinator - Creatives And Design", "8967654843", "https://www.facebook.com/subham.mondal.7547031", R.drawable.shubham_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Raghu Vamsi", "Coordinator - Creatives And Design", "9705471944", "https://www.facebook.com/veerapaneni.raghuvamsi", R.drawable.raghu_c)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Prateek Rai", "Coordinator - Management And Planning", "7222998383", "https://www.facebook.com/profile.php?id=100019405147477", R.drawable.prai_c)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Yashwanth Chowdhary", "Coordinator - Management And Planning", "9182994302", "https://www.facebook.com/yaswanthchowdary.muppalla.7", R.drawable.yashwanth_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Rama Krishna", "Coordinator - Management And Planning", "8985265942", "https://www.facebook.com/ramakrishna.rapelly", R.drawable.rama_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Pranshu Chandani", "Coordinator - Hospitality", "8791838088", "https://www.facebook.com/pranshu.chandani.5", R.drawable.pranshu_c1)); -// allMembers.add(new TeamItem("Vineet Mishra", "Coordinator - Hospitality", "7355154998", "", R.drawable.vineet_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Nikhil Bommera", "Coordinator - Hospitality", "6205559807", "https://www.facebook.com/nikhil.bommera.520", R.drawable.nikhil_c1)); - allMembers.add(new info.anwesha.iitp.team.TeamItem("Manoj Kumar", "Coordinator - Registrations And Security", "8328864643", "https://www.facebook.com/profile.php?id=100007306956302", R.drawable.manoj_c1)); - allMembers.add(new TeamItem("Aditya Ranjan", "Coordinator - Registrations And Security", "8271572990", "https://www.facebook.com/adityaranjan04", R.drawable.aditya_ranjan_c1)); +// allMembers.add(new info.anwesha.iitp.team.TeamItem("Mayank Wadhwani", "Fest Convener", "8181068781", "https://www.facebook.com/mayank.wadhwani", R.drawable.mayank_wadhwani)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Pranil Kesaralikar", "Overall Fest Coordinator", "6201169731", "https://www.facebook.com/pranil.kesaralikar", R.drawable.pranil)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Hitvardhan ", "Coordinator - Marketing and Sponsorship", "7761891077", "https://m.facebook.com/vardhan.hit", R.drawable.hitvardhan)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Nandan Shah ", "Coordinator - Marketing and Sponsorship", "0", "https://m.facebook.com/anwesha.iitpatna", R.drawable.nandan)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Mridul Srivastava ", "Coordinator - Marketing and Sponsorship", "0", "https://www.facebook.com/mridul.srivastava.3192", R.drawable.mridul)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Himanshu Gupta", "Coordinator - Media and Public Relations", "9521205729", "https://www.facebook.com/himgupta134", R.drawable.himanshu_gupta)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Kartik Singh", "Coordinator - Media and Public Relations", "8077516207", "https://www.facebook.com/profile.php?id=100005570138494", R.drawable.karthik_singh)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Bhavani Susmitha", "Coordinator - Media and Public Relations", "9123519137", "https://m.facebook.com/bhavani.susmitha", R.drawable.bhavani_susmitha)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Shivansh Shukla", "Pro Show Coordinator ", "8707499083", "https://facebook.com/shivansh.shukla.50", R.drawable.shivansh)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Kshitij Jain", "Coordinator - Development Team", "9131604185", "https://www.facebook.com/kshitij.jain.39904", R.drawable.kshitij_jain)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Adarsh Chaudhary ", "Coordinator - Development Team", "8827275145", "https://www.facebook.com/adarsh217", R.drawable.adarsh_chaudhary)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Vatsal Singhal", "Coordinator - Development Team", "8585992062", "https://m.facebook.com/vatsalsinghal1", R.drawable.vatsal_singhal)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Rajeshwar Ojha", "Coordinator - Creatives And Design", "07000125484", "https://www.facebook.com/rajeshwar.ojha.50", R.drawable.rajeshwar)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Utkarsh", "Coordinator - Creatives And Design", "08987044093", "https://www.facebook.com/utkarsh.virtuous", R.drawable.utkarsh)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Nikhil George", "Coordinator - Creatives And Design", "9060459361", "https://www.facebook.com/nikhil.george.102", R.drawable.nikhil_george)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Kanav Ghai", "Coordinator - Arts And Events Welfare", "7009857311", "https://www.facebook.com/kanav.ghai.1", R.drawable.kanav)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Deep Roshan", "Coordinator - Arts And Events Welfare", "0", "https://m.facebook.com/anwesha.iitpatna", R.drawable.deep)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Piyush Tiwary", "Coordinator - Technical Events Committee", "0", "https://www.facebook.com/thebackpropogator", R.drawable.piyush_tiwary)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Piyush Chauhan", "Coordinator - Technical Events Committee", "0", "https://www.facebook.com/piyushchauhaniitp", R.drawable.piyush_chauhan)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Avinash Singh", "Coordinator - Cultural Events Committee", "0", "https://www.facebook.com/profile.php?id=100021493361913", R.drawable.avinash)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Vivek Garg", "Coordinator - Cultural Events Committee", "0", "https://www.facebook.com/vivek.garg.102977", R.drawable.vivek)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Saurabh Gupta", "Coordinator - Cultural Events Committee", "0", "https://www.facebook.com/saurabh1666prime", R.drawable.saurabh)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Rahul Grover", "Coordinator - Hospitality", "8847433272", "https://m.facebook.com/rahulgrover1999", R.drawable.grover)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Rakshit Bhatt", "Coordinator - Hospitality", "9627765739", "https://m.facebook.com/", R.drawable.rakshit_bhatt)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Naveen Rathi", "Coordinator - Registrations And Security", "9079691918", "https://www.facebook.com/naveen.rathi.39395", R.drawable.naveen)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("D K Gurjar", "Coordinator - Registrations And Security", "9352052504", "https://www.dontUseFacebook.com", R.drawable.dk)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Neeraj Paraliya", "Coordinator - Registrations And Security", "0", "https://www.facebook.com/profile.php?id=100013775678152", R.drawable.neeraj)); + allMembers.add(new info.anwesha.iitp.team.TeamItem("Anuj Shastri", "Coordinator - Registrations And Security", "0", "https://www.facebook.com/anuj.shastri.3910", R.drawable.anuj_shastri)); adapter.setTeamItemList(allMembers); diff --git a/app/src/main/java/info/anwesha/iitp/team/TeamRecyclerAdapter.java b/app/src/main/java/info/anwesha/iitp/team/TeamRecyclerAdapter.java index 6558557..bc0a125 100644 --- a/app/src/main/java/info/anwesha/iitp/team/TeamRecyclerAdapter.java +++ b/app/src/main/java/info/anwesha/iitp/team/TeamRecyclerAdapter.java @@ -1,8 +1,6 @@ package info.anwesha.iitp.team; import android.content.Context; -import android.content.Intent; -import android.net.Uri; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,7 +16,6 @@ import java.util.List; import info.anwesha.iitp.R; -import info.anwesha.iitp.team.TeamItem; import info.anwesha.iitp.utils.IntentUtils; public class TeamRecyclerAdapter extends RecyclerView.Adapter { @@ -52,10 +49,10 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) { .into(holder.image); holder.facebook.setOnClickListener(v -> IntentUtils.openWebBrowser(context, current.getFacebook())); - holder.phone.setOnClickListener(v -> { + /*holder.phone.setOnClickListener(v -> { Intent i = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + current.getPhone())); context.startActivity(i); - }); + });*/ } else { holder.name.setText("Loading ..."); diff --git a/app/src/main/java/info/anwesha/iitp/utils/ImageViewerActivity.java b/app/src/main/java/info/anwesha/iitp/utils/ImageViewerActivity.java index 2daa618..3a1dbab 100644 --- a/app/src/main/java/info/anwesha/iitp/utils/ImageViewerActivity.java +++ b/app/src/main/java/info/anwesha/iitp/utils/ImageViewerActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { String url = getIntent().getStringExtra("image_url"); Glide.with(this) .load(url) - .placeholder(R.drawable.logo_alt) + .placeholder(R.drawable.anwesha_logo) .into(image); } else { diff --git a/app/src/main/java/info/anwesha/iitp/utils/IntentUtils.java b/app/src/main/java/info/anwesha/iitp/utils/IntentUtils.java index 08ee9c9..7483c39 100644 --- a/app/src/main/java/info/anwesha/iitp/utils/IntentUtils.java +++ b/app/src/main/java/info/anwesha/iitp/utils/IntentUtils.java @@ -5,16 +5,20 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.widget.Toast; import androidx.annotation.Nullable; public class IntentUtils { - public static boolean openWebBrowser(Context context, String url) { + public static void openWebBrowser(Context context, String url) { Uri page = Uri.parse(url); + if(!CheckNetwork.isNetworkConnected(context)){ + Toast.makeText(context, "No Internet Connection!!!", Toast.LENGTH_LONG).show(); + }else{ Intent intent = new Intent(Intent.ACTION_VIEW, page); - return safeOpenIntent(context, intent); - } + safeOpenIntent(context, intent); + }} public static boolean writeMail(Context context, String subject, String... recipientEmails) { diff --git a/app/src/main/res/drawable-v24/adarsh_chaudhary.jpg b/app/src/main/res/drawable-v24/adarsh_chaudhary.jpg new file mode 100644 index 0000000..2e7af54 Binary files /dev/null and b/app/src/main/res/drawable-v24/adarsh_chaudhary.jpg differ diff --git a/app/src/main/res/drawable-v24/bhavani_susmitha.jpg b/app/src/main/res/drawable-v24/bhavani_susmitha.jpg new file mode 100644 index 0000000..6cebb10 Binary files /dev/null and b/app/src/main/res/drawable-v24/bhavani_susmitha.jpg differ diff --git a/app/src/main/res/drawable-v24/dk.jpg b/app/src/main/res/drawable-v24/dk.jpg new file mode 100644 index 0000000..0533328 Binary files /dev/null and b/app/src/main/res/drawable-v24/dk.jpg differ diff --git a/app/src/main/res/drawable-v24/grover.jpg b/app/src/main/res/drawable-v24/grover.jpg new file mode 100644 index 0000000..7f32851 Binary files /dev/null and b/app/src/main/res/drawable-v24/grover.jpg differ diff --git a/app/src/main/res/drawable-v24/himanshu_gupta.jpg b/app/src/main/res/drawable-v24/himanshu_gupta.jpg new file mode 100644 index 0000000..9be57f9 Binary files /dev/null and b/app/src/main/res/drawable-v24/himanshu_gupta.jpg differ diff --git a/app/src/main/res/drawable-v24/hitvardhan.jpg b/app/src/main/res/drawable-v24/hitvardhan.jpg new file mode 100644 index 0000000..39e4140 Binary files /dev/null and b/app/src/main/res/drawable-v24/hitvardhan.jpg differ diff --git a/app/src/main/res/drawable-v24/karthik_singh.jpg b/app/src/main/res/drawable-v24/karthik_singh.jpg new file mode 100644 index 0000000..c803a99 Binary files /dev/null and b/app/src/main/res/drawable-v24/karthik_singh.jpg differ diff --git a/app/src/main/res/drawable-v24/kshitij_jain.jpeg b/app/src/main/res/drawable-v24/kshitij_jain.jpeg new file mode 100644 index 0000000..8181946 Binary files /dev/null and b/app/src/main/res/drawable-v24/kshitij_jain.jpeg differ diff --git a/app/src/main/res/drawable-v24/mayank_wadhwani.jpg b/app/src/main/res/drawable-v24/mayank_wadhwani.jpg new file mode 100644 index 0000000..1d49974 Binary files /dev/null and b/app/src/main/res/drawable-v24/mayank_wadhwani.jpg differ diff --git a/app/src/main/res/drawable-v24/naveen.jpg b/app/src/main/res/drawable-v24/naveen.jpg new file mode 100644 index 0000000..f318dc8 Binary files /dev/null and b/app/src/main/res/drawable-v24/naveen.jpg differ diff --git a/app/src/main/res/drawable-v24/pranil.jpg b/app/src/main/res/drawable-v24/pranil.jpg new file mode 100644 index 0000000..00f46f3 Binary files /dev/null and b/app/src/main/res/drawable-v24/pranil.jpg differ diff --git a/app/src/main/res/drawable-v24/rajeshwar.jpg b/app/src/main/res/drawable-v24/rajeshwar.jpg new file mode 100644 index 0000000..14d46fc Binary files /dev/null and b/app/src/main/res/drawable-v24/rajeshwar.jpg differ diff --git a/app/src/main/res/drawable-v24/rakshit_bhatt.jpg b/app/src/main/res/drawable-v24/rakshit_bhatt.jpg new file mode 100644 index 0000000..5d21cfc Binary files /dev/null and b/app/src/main/res/drawable-v24/rakshit_bhatt.jpg differ diff --git a/app/src/main/res/drawable-v24/shivansh.jpg b/app/src/main/res/drawable-v24/shivansh.jpg new file mode 100644 index 0000000..025316c Binary files /dev/null and b/app/src/main/res/drawable-v24/shivansh.jpg differ diff --git a/app/src/main/res/drawable-v24/ssf.png b/app/src/main/res/drawable-v24/ssf.png new file mode 100644 index 0000000..3cf152b Binary files /dev/null and b/app/src/main/res/drawable-v24/ssf.png differ diff --git a/app/src/main/res/drawable-v24/utkarsh.jpg b/app/src/main/res/drawable-v24/utkarsh.jpg new file mode 100644 index 0000000..1dd56b8 Binary files /dev/null and b/app/src/main/res/drawable-v24/utkarsh.jpg differ diff --git a/app/src/main/res/drawable-v24/vatsal_singhal.jpg b/app/src/main/res/drawable-v24/vatsal_singhal.jpg new file mode 100644 index 0000000..93dd659 Binary files /dev/null and b/app/src/main/res/drawable-v24/vatsal_singhal.jpg differ diff --git a/app/src/main/res/drawable/adarsh_chaudhary.jpg b/app/src/main/res/drawable/adarsh_chaudhary.jpg new file mode 100644 index 0000000..2e7af54 Binary files /dev/null and b/app/src/main/res/drawable/adarsh_chaudhary.jpg differ diff --git a/app/src/main/res/drawable/anuj_shastri.jpg b/app/src/main/res/drawable/anuj_shastri.jpg new file mode 100644 index 0000000..8567b50 Binary files /dev/null and b/app/src/main/res/drawable/anuj_shastri.jpg differ diff --git a/app/src/main/res/drawable/anwesha_logo.png b/app/src/main/res/drawable/anwesha_logo.png new file mode 100644 index 0000000..644414e Binary files /dev/null and b/app/src/main/res/drawable/anwesha_logo.png differ diff --git a/app/src/main/res/drawable/anwesha_logo_long_2.png b/app/src/main/res/drawable/anwesha_logo_long_2.png new file mode 100644 index 0000000..4134140 Binary files /dev/null and b/app/src/main/res/drawable/anwesha_logo_long_2.png differ diff --git a/app/src/main/res/drawable/avinash.jpg b/app/src/main/res/drawable/avinash.jpg new file mode 100644 index 0000000..0d3e712 Binary files /dev/null and b/app/src/main/res/drawable/avinash.jpg differ diff --git a/app/src/main/res/drawable/back.jpg b/app/src/main/res/drawable/back.jpg index 7d01001..7970a18 100644 Binary files a/app/src/main/res/drawable/back.jpg and b/app/src/main/res/drawable/back.jpg differ diff --git a/app/src/main/res/drawable/background_team.jpeg b/app/src/main/res/drawable/background_team.jpeg new file mode 100644 index 0000000..82d8059 Binary files /dev/null and b/app/src/main/res/drawable/background_team.jpeg differ diff --git a/app/src/main/res/drawable/bg_overlay.xml b/app/src/main/res/drawable/bg_overlay.xml new file mode 100644 index 0000000..f59e770 --- /dev/null +++ b/app/src/main/res/drawable/bg_overlay.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bhavani_susmitha.jpg b/app/src/main/res/drawable/bhavani_susmitha.jpg new file mode 100644 index 0000000..6cebb10 Binary files /dev/null and b/app/src/main/res/drawable/bhavani_susmitha.jpg differ diff --git a/app/src/main/res/drawable/celesta_logo_long_2.png b/app/src/main/res/drawable/celesta_logo_long_2.png deleted file mode 100644 index 07fb566..0000000 Binary files a/app/src/main/res/drawable/celesta_logo_long_2.png and /dev/null differ diff --git a/app/src/main/res/drawable/deep.jpg b/app/src/main/res/drawable/deep.jpg new file mode 100644 index 0000000..eaaf273 Binary files /dev/null and b/app/src/main/res/drawable/deep.jpg differ diff --git a/app/src/main/res/drawable/grover.jpg b/app/src/main/res/drawable/grover.jpg new file mode 100644 index 0000000..7f32851 Binary files /dev/null and b/app/src/main/res/drawable/grover.jpg differ diff --git a/app/src/main/res/drawable/himanshu_gupta.jpg b/app/src/main/res/drawable/himanshu_gupta.jpg new file mode 100644 index 0000000..9be57f9 Binary files /dev/null and b/app/src/main/res/drawable/himanshu_gupta.jpg differ diff --git a/app/src/main/res/drawable/hitvardhan.jpg b/app/src/main/res/drawable/hitvardhan.jpg new file mode 100644 index 0000000..39e4140 Binary files /dev/null and b/app/src/main/res/drawable/hitvardhan.jpg differ diff --git a/app/src/main/res/drawable/ic_aftermovie.xml b/app/src/main/res/drawable/ic_aftermovie.xml new file mode 100644 index 0000000..c117efb --- /dev/null +++ b/app/src/main/res/drawable/ic_aftermovie.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_assistant_black_24dp.xml b/app/src/main/res/drawable/ic_assistant_black_24dp.xml new file mode 100644 index 0000000..2430c47 --- /dev/null +++ b/app/src/main/res/drawable/ic_assistant_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml b/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml new file mode 100644 index 0000000..3bdbc9f --- /dev/null +++ b/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_brightness_1_black_24dp.xml b/app/src/main/res/drawable/ic_brightness_1_black_24dp.xml new file mode 100644 index 0000000..dda4603 --- /dev/null +++ b/app/src/main/res/drawable/ic_brightness_1_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_business_black_24dp.xml b/app/src/main/res/drawable/ic_business_black_24dp.xml new file mode 100644 index 0000000..8924cc8 --- /dev/null +++ b/app/src/main/res/drawable/ic_business_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_competition.xml b/app/src/main/res/drawable/ic_competition.xml new file mode 100644 index 0000000..5d81f30 --- /dev/null +++ b/app/src/main/res/drawable/ic_competition.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_contact_us.xml b/app/src/main/res/drawable/ic_contact_us.xml new file mode 100644 index 0000000..9cd3857 --- /dev/null +++ b/app/src/main/res/drawable/ic_contact_us.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_events2.xml b/app/src/main/res/drawable/ic_events2.xml new file mode 100644 index 0000000..fb26532 --- /dev/null +++ b/app/src/main/res/drawable/ic_events2.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_gallery2.xml b/app/src/main/res/drawable/ic_gallery2.xml new file mode 100644 index 0000000..727abed --- /dev/null +++ b/app/src/main/res/drawable/ic_gallery2.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_pronite2.xml b/app/src/main/res/drawable/ic_pronite2.xml new file mode 100644 index 0000000..7beda00 --- /dev/null +++ b/app/src/main/res/drawable/ic_pronite2.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_timer_black_24dp.xml b/app/src/main/res/drawable/ic_timer_black_24dp.xml new file mode 100644 index 0000000..f41be80 --- /dev/null +++ b/app/src/main/res/drawable/ic_timer_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_touch_app.xml b/app/src/main/res/drawable/ic_touch_app.xml new file mode 100644 index 0000000..e8a0c1b --- /dev/null +++ b/app/src/main/res/drawable/ic_touch_app.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_touch_app_black_24dp.xml b/app/src/main/res/drawable/ic_touch_app_black_24dp.xml new file mode 100644 index 0000000..f1fd4c7 --- /dev/null +++ b/app/src/main/res/drawable/ic_touch_app_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml new file mode 100644 index 0000000..5eeb35b --- /dev/null +++ b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/kanav.jpg b/app/src/main/res/drawable/kanav.jpg new file mode 100644 index 0000000..8cf04ec Binary files /dev/null and b/app/src/main/res/drawable/kanav.jpg differ diff --git a/app/src/main/res/drawable/karthik_singh.jpg b/app/src/main/res/drawable/karthik_singh.jpg new file mode 100644 index 0000000..c803a99 Binary files /dev/null and b/app/src/main/res/drawable/karthik_singh.jpg differ diff --git a/app/src/main/res/drawable/kk.jpg b/app/src/main/res/drawable/kk.jpg new file mode 100644 index 0000000..c4bf720 Binary files /dev/null and b/app/src/main/res/drawable/kk.jpg differ diff --git a/app/src/main/res/drawable/kshitij_jain.jpeg b/app/src/main/res/drawable/kshitij_jain.jpeg new file mode 100644 index 0000000..8181946 Binary files /dev/null and b/app/src/main/res/drawable/kshitij_jain.jpeg differ diff --git a/app/src/main/res/drawable/login_back.jpg b/app/src/main/res/drawable/login_back.jpg new file mode 100644 index 0000000..cd3d8ab Binary files /dev/null and b/app/src/main/res/drawable/login_back.jpg differ diff --git a/app/src/main/res/drawable/login_background.jpeg b/app/src/main/res/drawable/login_background.jpeg new file mode 100644 index 0000000..cf209d9 Binary files /dev/null and b/app/src/main/res/drawable/login_background.jpeg differ diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png new file mode 100755 index 0000000..4134140 Binary files /dev/null and b/app/src/main/res/drawable/logo.png differ diff --git a/app/src/main/res/drawable/logo_alt.png b/app/src/main/res/drawable/logo_alt.png deleted file mode 100644 index 9c245af..0000000 Binary files a/app/src/main/res/drawable/logo_alt.png and /dev/null differ diff --git a/app/src/main/res/drawable/mridul.jpg b/app/src/main/res/drawable/mridul.jpg new file mode 100644 index 0000000..c7157ff Binary files /dev/null and b/app/src/main/res/drawable/mridul.jpg differ diff --git a/app/src/main/res/drawable/nandan.jpg b/app/src/main/res/drawable/nandan.jpg new file mode 100644 index 0000000..cdfc922 Binary files /dev/null and b/app/src/main/res/drawable/nandan.jpg differ diff --git a/app/src/main/res/drawable/neeraj.jpg b/app/src/main/res/drawable/neeraj.jpg new file mode 100644 index 0000000..28cd984 Binary files /dev/null and b/app/src/main/res/drawable/neeraj.jpg differ diff --git a/app/src/main/res/drawable/nikhil_george.jpg b/app/src/main/res/drawable/nikhil_george.jpg new file mode 100644 index 0000000..443f0b9 Binary files /dev/null and b/app/src/main/res/drawable/nikhil_george.jpg differ diff --git a/app/src/main/res/drawable/piyush_chauhan.jpg b/app/src/main/res/drawable/piyush_chauhan.jpg new file mode 100644 index 0000000..0e96727 Binary files /dev/null and b/app/src/main/res/drawable/piyush_chauhan.jpg differ diff --git a/app/src/main/res/drawable/piyush_tiwary.jpg b/app/src/main/res/drawable/piyush_tiwary.jpg new file mode 100644 index 0000000..ffd412f Binary files /dev/null and b/app/src/main/res/drawable/piyush_tiwary.jpg differ diff --git a/app/src/main/res/drawable/rajeshwar.jpg b/app/src/main/res/drawable/rajeshwar.jpg new file mode 100644 index 0000000..14d46fc Binary files /dev/null and b/app/src/main/res/drawable/rajeshwar.jpg differ diff --git a/app/src/main/res/drawable/rakshit_bhat.jpg b/app/src/main/res/drawable/rakshit_bhat.jpg new file mode 100644 index 0000000..5d21cfc Binary files /dev/null and b/app/src/main/res/drawable/rakshit_bhat.jpg differ diff --git a/app/src/main/res/drawable/reg1.jpg b/app/src/main/res/drawable/reg1.jpg new file mode 100644 index 0000000..0533328 Binary files /dev/null and b/app/src/main/res/drawable/reg1.jpg differ diff --git a/app/src/main/res/drawable/reg2.jpg b/app/src/main/res/drawable/reg2.jpg new file mode 100644 index 0000000..f318dc8 Binary files /dev/null and b/app/src/main/res/drawable/reg2.jpg differ diff --git a/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml index 1d5f90b..3286e84 100644 --- a/app/src/main/res/drawable/rounded_button.xml +++ b/app/src/main/res/drawable/rounded_button.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/drawable/saurabh.jpg b/app/src/main/res/drawable/saurabh.jpg new file mode 100644 index 0000000..ad08ed9 Binary files /dev/null and b/app/src/main/res/drawable/saurabh.jpg differ diff --git a/app/src/main/res/drawable/semi_circle.xml b/app/src/main/res/drawable/semi_circle.xml new file mode 100644 index 0000000..1d9a884 --- /dev/null +++ b/app/src/main/res/drawable/semi_circle.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shivansh.jpg b/app/src/main/res/drawable/shivansh.jpg new file mode 100644 index 0000000..025316c Binary files /dev/null and b/app/src/main/res/drawable/shivansh.jpg differ diff --git a/app/src/main/res/drawable/sky.jpg b/app/src/main/res/drawable/sky.jpg new file mode 100644 index 0000000..9934f50 Binary files /dev/null and b/app/src/main/res/drawable/sky.jpg differ diff --git a/app/src/main/res/drawable/splash.gif b/app/src/main/res/drawable/splash.gif new file mode 100644 index 0000000..43799aa Binary files /dev/null and b/app/src/main/res/drawable/splash.gif differ diff --git a/app/src/main/res/drawable/tv2.jpeg b/app/src/main/res/drawable/tv2.jpeg new file mode 100644 index 0000000..459ce8a Binary files /dev/null and b/app/src/main/res/drawable/tv2.jpeg differ diff --git a/app/src/main/res/drawable/utkarsh.jpg b/app/src/main/res/drawable/utkarsh.jpg new file mode 100644 index 0000000..1dd56b8 Binary files /dev/null and b/app/src/main/res/drawable/utkarsh.jpg differ diff --git a/app/src/main/res/drawable/vatsal_singhal.jpg b/app/src/main/res/drawable/vatsal_singhal.jpg new file mode 100644 index 0000000..93dd659 Binary files /dev/null and b/app/src/main/res/drawable/vatsal_singhal.jpg differ diff --git a/app/src/main/res/drawable/vivek.jpg b/app/src/main/res/drawable/vivek.jpg new file mode 100644 index 0000000..e511b8a Binary files /dev/null and b/app/src/main/res/drawable/vivek.jpg differ diff --git a/app/src/main/res/font/jim_nightshade.ttf b/app/src/main/res/font/jim_nightshade.ttf new file mode 100644 index 0000000..962b19f Binary files /dev/null and b/app/src/main/res/font/jim_nightshade.ttf differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1e3b336..d956b5e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@color/navigation_background" + android:background="@drawable/back" android:fitsSystemWindows="true" app:itemTextColor="@android:color/white" app:itemIconTint="@android:color/white" diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 0000000..252244e --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/app/src/main/res/layout/card_events.xml b/app/src/main/res/layout/card_events.xml index cc64d93..f81ca00 100644 --- a/app/src/main/res/layout/card_events.xml +++ b/app/src/main/res/layout/card_events.xml @@ -81,7 +81,7 @@ android:layout_gravity="end|center" android:contentDescription="speaker avatar" android:scaleType="centerInside" - android:src="@drawable/logo_alt" /> + android:src="@drawable/anwesha_logo" /> diff --git a/app/src/main/res/layout/card_livefeed.xml b/app/src/main/res/layout/card_livefeed.xml new file mode 100644 index 0000000..2d94d45 --- /dev/null +++ b/app/src/main/res/layout/card_livefeed.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/card_sponsors.xml b/app/src/main/res/layout/card_sponsors.xml index 2e489fd..b7fed2b 100644 --- a/app/src/main/res/layout/card_sponsors.xml +++ b/app/src/main/res/layout/card_sponsors.xml @@ -4,37 +4,86 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cv_sponsors" android:layout_width="match_parent" - android:layout_height="150dp" + android:layout_height="wrap_content" android:layout_margin="8dp" - app:cardBackgroundColor="@color/transparent" + app:cardBackgroundColor="@color/team_page_background" app:cardCornerRadius="8dp" app:strokeColor="@color/navigation_background" app:strokeWidth="1dp"> + + android:layout_height="wrap_content" + android:orientation="horizontal"> - - - + android:layout_width="100dp" + android:layout_height="104dp" + android:layout_gravity="center" + android:padding="8dp" + tools:src="@drawable/deepanjan_c1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/card_team.xml b/app/src/main/res/layout/card_team.xml index 9410dbb..ab36097 100644 --- a/app/src/main/res/layout/card_team.xml +++ b/app/src/main/res/layout/card_team.xml @@ -4,9 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + app:cardCornerRadius="5dp" app:contentPadding="8dp" android:layout_margin="8dp" - app:cardBackgroundColor="@color/event_detail_card_background"> + app:cardBackgroundColor="@color/team_page_background"> + android:textColor="@color/team_text" /> @@ -99,7 +103,7 @@ android:layout_width="35dp" android:layout_height="35dp" android:layout_margin="4dp" - app:cardBackgroundColor="@color/event_detail_card_background" + app:cardBackgroundColor="@color/team_text" app:cardCornerRadius="17dp" app:contentPadding="6dp"> diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index bb3f843..858b203 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -3,7 +3,7 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 80b539f..fad7d80 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -25,8 +25,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:text="Backend & Web Developers" - android:textColor="@color/white" + android:text="@string/backend_amp_web_developers" + android:textColor="@color/registration_page" android:textSize="24sp" android:textStyle="bold" /> @@ -46,6 +46,7 @@ @@ -61,8 +62,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:text="Ashwani Yadav" - android:textColor="@color/medBlue" + android:text="@string/ashwani_yadav" + android:textColor="@color/registration_page" android:textSize="20sp" android:textStyle="bold" /> @@ -156,8 +157,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:text="Amartya Mondal" - android:textColor="@color/medBlue" + android:text="@string/amish_mittal" + android:textColor="@color/registration_page" android:textSize="20sp" android:textStyle="bold" /> @@ -222,6 +223,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,8 +461,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:text="Somenath Sarkar" - android:textColor="@color/medBlue" + android:text="@string/somenath_sarkar" + android:textColor="@color/registration_page" android:textSize="20sp" android:textStyle="bold" /> @@ -283,7 +472,7 @@ android:orientation="horizontal"> + + + + + + + + android:layout_margin="16dp" + android:visibility="gone"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -367,8 +738,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" - android:text="Aman Jee" - android:textColor="@color/medBlue" + android:text="@string/debarghya_maiti" + android:textColor="@color/registration_page" android:textSize="20sp" android:textStyle="bold" /> @@ -378,7 +749,7 @@ android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_accomodation.xml b/app/src/main/res/layout/fragment_accomodation.xml new file mode 100644 index 0000000..dc59460 --- /dev/null +++ b/app/src/main/res/layout/fragment_accomodation.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + +