Version 1.1 (#72)

* login page changed * Changing permission of gradlew * feat: Add circle ci * feat: Update circle ci script * feat: fix circle ci script * fix: Modify gitignore files * chore: Update readme Add readme * after movie added and anwesha name added (#21) * feat: Modify Team Members Data (#14) * Modified the Team Member Data * Fixed useless Comments Co-authored-by: Amartya Mondal <[email protected]> * login page updated (#23) * Added Acommodation Fragment Infrastructure (#25) * Modified home page and changed app icon. (#15) * feat: Updated developers page (#26) * Updated developers page * Fixes #10 * feat: Added Game page (#27) * Updated developers page * Fixes #10 * feat: Add game page * game_page * final * feat: Implement slider (#28) * feat: Fix home screen ui * feat: Implemented slider * feat: Add game (#30) * feat: Add Game * feat: Change nav colour * fix: Fix build * feat: Modify Team and Registration Page (#31) * Modified home page and changed app icon. * Üpdated Team Page and Modified Registration Page * feat: Changes done (#32) * Theme removed, Aftermovie removed, Contact page updated, Homepage icons changed * Updated1 * feat: Fix ui (#33) * feat: Events page (#34) * Added Acommodation Fragment Infrastructure * Minor UI fixes * Minor UI fixes-final final ui * Modified contact page. (#35) * Modified action bar and newsfeed. (#37) * feat: Modify Registration Page and Developer's Page (#36) * Updated Developer's Page, Fixed Registration Page and disabled Call Function of Team Page * Optimize Imports * Updated Anwesha icon and Fixed login orientation (#38) * Special Events page updated (#39) * feat: Remove unwanted dats (#41) * rmv: Remove login * Remove accommdoation * feat: Developers page modified * feat: Regiaster fixed * feat: Update gif * fix: Fix circleci build * feat: Remove register button (#42) * register button removed * fix: Fix Circleci * Update Team Anwesha (#43) * Fixed icon issue (#45) * Changed baseURL * Addedcoming soon in pronite * Fixed build errors * fix: Modify Pronite Page (#46) * Modify Pronite Page * Remove Call Button * new load gif added (#48) * feat: Splash screen added (#44) * Splash screen added * feat: splash screen updated * fix: format corrected * Improved splash screen * Removed unnecessary images * Fixed build issue * Added API and Response file * Updated team page. (#51) * feat: current status of Anwesha added in header view (#50) * fix: header view updated (#52) * fix: header view fixed * fix: header view updated * Add competition page. (#53) * Added live feed Recycler view * Changed NewsFeed to LiveFeed * rmv: Remove game (#56) * feat: Add events category (#57) * feat: Add events category * feat: emove unwanted lines * Fixed navDrawerIssue and Updated Developers Page (#58) * feat: Added tv (#54) * added tv * modified * orientation changes (#59) * Changed order in team page and fix margin issue (#61) * feat: Change pronite (#62) * orientation changes * Pronite changed * fix circleci * feat: Add competetions type data (#60) * feat: Reuse events and competetions * feat: Remove special events * feat: Fix build * feat: Competetion live * feat: Show names properly * feat: Change action bar title . (#64) * Alignment in nav header. * Show correct action bar title. * fix: picture added in developers page (#63) * Change Version Number * fix: Fixed issues related to livefeed and splash screen (#66) * Fixed issues related to livefeed and splash screen * Update LiveFeedApi.java * Added organizer of pronite * Notification (#68) * Open intent * feat: Control Flash Light * Refactor flashilight * feat: Blink Flash light * feat: Check SDK version * feat: Fix updates * feat: Remove test * feat: Events' schedule (#67) * Added Acommodation Fragment Infrastructure * Schedule Updated * Update Sponsor Page (#69) * Fix crash (#71) * feat: Remove handler * fix: Fix crash * feat: Minor fix (#70) * Added Acommodation Fragment Infrastructure * Minor fixes Co-authored-by: debarghya472 <[email protected]> Co-authored-by: Kavya Goyal <[email protected]> Co-authored-by: Ayush Shrivastava <[email protected]> Co-authored-by: Priyanka Sachan <[email protected]> Co-authored-by: Mehulipal <[email protected]> Co-authored-by: somenath sarkar <[email protected]> Co-authored-by: VatsalSin <[email protected]>
anweshaiitp · Feb 6, 2020 · cfa770f · cfa770f
1 parent 81ba0b7
commit cfa770f
Show file tree

Hide file tree

Showing 171 changed files with 3,125 additions and 1,024 deletions.
diff --git a/.circleci/config.yml 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
diff --git 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
diff --git a/README.md 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
@@ -1,2 +1 @@
 /build
-google-services.json
diff --git 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
@@ -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"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,18 +2,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="info.anwesha.iitp">
+    <uses-feature android:name="android.hardware.camera.flash" />
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-  <application
+    <application
         android:allowBackup="true"
-        android:icon="@mipmap/celesta_icon_round"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/celesta_icon_round"
+        android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name=".SplashActivity" android:theme="@style/NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".Auth.LoginRegisterActivity"
             android:screenOrientation="portrait"
@@ -22,18 +28,14 @@
         <activity
             android:name=".home.MainActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar"></activity>
         <activity
             android:name=".utils.ImageViewerActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.FullScreen" />
 
-        <service android:name=".notification.FcmService"
+        <service
+            android:name=".notification.FcmService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
@@ -48,4 +50,6 @@
         </service>
     </application>
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
 </manifest>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 -> {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Anwesha2k20-Android-App
		An app for the techno-cultural-management fest of IIT Patna.