Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New sohail #43

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
d466b7e
first commit
thshubham Feb 15, 2022
d4395c6
userfeed-home page in xml
thshubham Feb 15, 2022
3559c54
userfeed-home page in xml
thshubham Feb 15, 2022
02658d2
userfeed-home page in xml
thshubham Feb 15, 2022
014afd4
userfeed-home page in xml
thshubham Feb 15, 2022
bd1d25c
Without resources
thshubham Feb 18, 2022
983c5d3
with id's
thshubham Feb 19, 2022
35a3d9b
Merge remote-tracking branch 'origin/user_feed_recyclerView' into til…
thshubham Feb 20, 2022
14a5157
only string and dimen resources remain
thshubham Feb 20, 2022
420b64d
just before bottom bar
apaseg Feb 20, 2022
22130cc
Merge pull request #10 from appteam-nith/till-bottombar-Akash
sa-tyam Feb 21, 2022
208995c
Merge pull request #11 from appteam-nith/till-bottombar-AnmolTiwari
sa-tyam Feb 21, 2022
540683a
Merge branch 'till-bottombar-satyam' into till-bottombar-shubham
sa-tyam Feb 21, 2022
0d6a43d
Merge pull request #12 from appteam-nith/till-bottombar-shubham
sa-tyam Feb 21, 2022
461fb82
firebase authentication added
1someshverma Feb 21, 2022
07633e0
userFeedFragment commit
07suryansh Feb 21, 2022
3ef1026
event details and sponsors
coder024 Feb 22, 2022
c647209
event and workshop java
sohail2000 Feb 22, 2022
040bfdb
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
sohail2000 Feb 22, 2022
facf51c
Merge pull request #13 from appteam-nith/till-bottombar-somesh
sa-tyam Feb 22, 2022
49ab0a6
Merge pull request #15 from appteam-nith/till-bottombar
sa-tyam Feb 22, 2022
2bbdbca
Merge pull request #16 from appteam-nith/till-bottombar-suryansh
sa-tyam Feb 22, 2022
fe82c70
Merge pull request #17 from appteam-nith/till-bottombar-khushboo
sa-tyam Feb 22, 2022
e2001fd
event and workshop with xml
sohail2000 Feb 23, 2022
01dfa5b
constrain edit and logout button
apaseg Feb 23, 2022
7645146
event details and sponsors
coder024 Feb 22, 2022
c27e371
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Feb 23, 2022
ae2fbe5
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Feb 23, 2022
2169525
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Feb 23, 2022
dee7f2f
Added like button with response
07suryansh Feb 23, 2022
fee813c
Add Post button added
07suryansh Feb 23, 2022
441a9c7
linked post to comment user feed and added post screen
07suryansh Feb 24, 2022
6a3051d
Rohit Yadav
Rohit1411Y Feb 25, 2022
296c0fc
Merge pull request #18 from appteam-nith/till-bottombar-sohail
sa-tyam Feb 25, 2022
914cbc0
Merge pull request #21 from appteam-nith/till-bottombar-AnmolTiwari
sa-tyam Feb 25, 2022
0da7b24
Merge pull request #22 from appteam-nith/till-bottombar-khushboo
sa-tyam Feb 25, 2022
a04f855
Merge branch 'till-bottombar-satyam' into till-bottombar-suryansh
sa-tyam Feb 25, 2022
5625883
Merge pull request #23 from appteam-nith/till-bottombar-suryansh
sa-tyam Feb 25, 2022
749e303
Merge branch 'till-bottombar-satyam' into till-bottombar-rohit
sa-tyam Feb 25, 2022
278292d
Merge pull request #24 from appteam-nith/till-bottombar-rohit
sa-tyam Feb 25, 2022
c3720c8
like image in comment user feed
07suryansh Feb 25, 2022
8a38b09
progress dialog added
1someshverma Feb 25, 2022
4945bdc
Rohit Yadav
Rohit1411Y Feb 25, 2022
20650d0
open gallery function
07suryansh Feb 25, 2022
de75411
Merge remote-tracking branch 'origin/till-bottombar-suryansh' into ti…
07suryansh Feb 25, 2022
0f0b8a9
Merge remote-tracking branch 'origin/till-bottombar-rohit' into till-…
Rohit1411Y Feb 26, 2022
34157b5
Builded project successfully and removed error
07suryansh Feb 27, 2022
b4ae574
before quiz and leaderboard
sohail2000 Feb 28, 2022
2043581
internet permission
sohail2000 Feb 28, 2022
972dfc2
Merge pull request #27 from appteam-nith/till-bottombar-somesh
sa-tyam Feb 28, 2022
e14e43e
Merge pull request #28 from appteam-nith/till-bottombar-rohit
sa-tyam Feb 28, 2022
a26c6c3
Merge pull request #29 from appteam-nith/till-bottombar-suryansh
sa-tyam Feb 28, 2022
2d93616
Merge branch 'till-bottombar-satyam' into till-bottombar-sohail
sa-tyam Feb 28, 2022
52b8a1c
Merge pull request #30 from appteam-nith/till-bottombar-sohail
sa-tyam Feb 28, 2022
122a8e0
Rohit Yadav
Rohit1411Y Feb 28, 2022
ac73616
dated 28 feb, all working fine
sa-tyam Feb 28, 2022
24a1ca8
navbar changes
thshubham Feb 28, 2022
eb589d3
some modification
thshubham Feb 28, 2022
55c1428
some modification 2.0
thshubham Feb 28, 2022
8e35376
Re-checking
apaseg Mar 1, 2022
12ed823
resources compilation done
thshubham Mar 1, 2022
8b75aa4
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Feb 23, 2022
01ed7cd
optimized add comment button
07suryansh Mar 3, 2022
fd76b52
toogle switch
thshubham Mar 3, 2022
04e1100
Rohit Yadav
Rohit1411Y Mar 3, 2022
5167f8e
Merge pull request #31 from appteam-nith/till-bottombar-rohit
KhyatiSaini Mar 3, 2022
625c511
Data from backend
akashnith Mar 4, 2022
dd95631
Data from backend
akashnith Mar 4, 2022
c57f0f3
Data from backend
akashnith Mar 4, 2022
8c19ef4
events and workshop with data
sohail2000 Mar 4, 2022
348c18a
sponsors with data
sohail2000 Mar 4, 2022
d36345a
Modify MemberVolleyHelper and Teams
Rohit1411Y Mar 4, 2022
9ceb8f4
Merge pull request #32 from appteam-nith/till-bottombar-satyam-rohit
KhyatiSaini Mar 5, 2022
0b4904b
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Mar 5, 2022
7c2ee94
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Mar 5, 2022
20705ca
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Mar 5, 2022
35666a4
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Mar 5, 2022
998aa84
Merge remote-tracking branch 'origin/till-bottombar-khushboo' into ti…
coder024 Mar 5, 2022
13c030e
Merge remote-tracking branch 'origin/till-bottombar-satyam' into till…
07suryansh Mar 6, 2022
1d8c724
Modify New_User_VolleyHelper
Rohit1411Y Mar 6, 2022
ca61f64
Merge branch 'till-bottombar-satyam' into till-bottombar-satyam-akash
sa-tyam Mar 6, 2022
6b1ca46
Merge pull request #34 from appteam-nith/till-bottombar-satyam-akash
sa-tyam Mar 6, 2022
734517e
Merge pull request #37 from appteam-nith/till-bottombar-satyam-rohit
sa-tyam Mar 6, 2022
14c21a1
Merge pull request #38 from appteam-nith/till-bottombar-suryansh
sa-tyam Mar 6, 2022
c4b1463
Merge branch 'till-bottombar-satyam' into till-bottombar-khushboo
sa-tyam Mar 6, 2022
dda77b6
Merge pull request #39 from appteam-nith/till-bottombar-khushboo
sa-tyam Mar 6, 2022
14f5aab
Merge branch 'till-bottombar-satyam' into till-bottombar-AnmolTiwari
sa-tyam Mar 6, 2022
465f26e
Merge pull request #40 from appteam-nith/till-bottombar-AnmolTiwari
sa-tyam Mar 6, 2022
579f4ae
Merge branch 'till-bottombar-satyam' into till-bottombar-satyam-shubh…
sa-tyam Mar 6, 2022
b278273
Merge pull request #41 from appteam-nith/till-bottombar-satyam-shubha…
sa-tyam Mar 6, 2022
2fb8507
Merge branch 'till-bottombar-satyam' into till-bottombar-sohail
sa-tyam Mar 6, 2022
db3ea58
Merge pull request #42 from appteam-nith/till-bottombar-sohail
sa-tyam Mar 6, 2022
eac51fa
events and sponsors fixed
sohail2000 Mar 6, 2022
a0247c7
play quiz without data
sohail2000 Mar 10, 2022
3883c3b
quiz with data
sohail2000 Mar 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 48 additions & 10 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 39 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
buildscript {
// ...
dependencies {
// ...
classpath 'com.google.gms:google-services:4.3.2'
}
}
plugins {
id 'com.android.application'
id 'com.google.gms.google-services'
}


android {
compileSdk 31

Expand Down Expand Up @@ -29,14 +38,43 @@ android {

dependencies {


implementation platform('com.google.firebase:firebase-bom:29.1.0')
implementation 'com.google.firebase:firebase-auth'


implementation 'androidx.appcompat:appcompat:1.4.1'
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.firebase:firebase-core:20.1.0'
implementation 'com.google.firebase:firebase-auth:21.0.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

// volley
implementation 'com.android.volley:volley:1.2.1'
}
//glide
implementation 'com.github.bumptech.glide:glide:4.13.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
// recycler animators
implementation 'jp.wasabeef:recyclerview-animators:4.0.2'

//picasso
implementation 'com.squareup.picasso:picasso:2.71828'
// recycler animators
implementation 'jp.wasabeef:recyclerview-animators:4.0.2'

//fab
implementation 'com.balysv:material-ripple:1.0.2'

implementation platform('com.google.firebase:firebase-bom:29.1.0')

implementation 'com.google.firebase:firebase-auth'

}

apply plugin: 'com.google.gms.google-services'
39 changes: 39 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"project_info": {
"project_number": "339348749335",
"project_id": "hillffair22",
"storage_bucket": "hillffair22.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:339348749335:android:26e85df79d6b43806af052",
"android_client_info": {
"package_name": "com.nith.hillfair2k22"
}
},
"oauth_client": [
{
"client_id": "339348749335-95clst4snuom47senakou70vpj2s5405.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyD9ut9FMht_B9mBD-VFhztElppi7-yqCsE"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "339348749335-95clst4snuom47senakou70vpj2s5405.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
20 changes: 17 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,27 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.nith.hillfair2k22">

<!--permissions for INTERNET-->
<uses-permission android:name="android.permission.INTERNET"/>
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Hillfair2k22">
<activity
android:name=".ChatActivity"
android:exported="false" />
<activity
android:name=".screens.account.EditProfileActivity"
android:exported="false" />
<activity
android:name=".screens.home.CommentUserFeedFragment"
android:exported="false" />
<activity
android:name=".screens.home.CreateNewFeedFragment"
android:exported="false" />
<activity
android:name=".screens.account.ForgotPasswordActivity"
android:exported="false" />
Expand All @@ -26,10 +37,10 @@
android:exported="false" />
<activity
android:name=".screens.teams.TeamDetailsActivity"
android:exported="false"/>
android:exported="false" />
<activity
android:name=".screens.splashScreen.SplashScreenActivity"
android:exported="true" >
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -39,8 +50,11 @@
<activity
android:name=".MainActivity"
android:exported="false">

</activity>

<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
</application>

</manifest>
14 changes: 14 additions & 0 deletions app/src/main/java/com/nith/hillfair2k22/ChatActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.nith.hillfair2k22;

import androidx.appcompat.app.AppCompatActivity;

import android.os.Bundle;

public class ChatActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_chat);
}
}
2 changes: 2 additions & 0 deletions app/src/main/java/com/nith/hillfair2k22/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,6 @@ private void replaceFragment(Fragment fragment){
fragmentTransaction.replace(R.id.fragment_frame_layout,fragment);
fragmentTransaction.commit();
}


}
52 changes: 52 additions & 0 deletions app/src/main/java/com/nith/hillfair2k22/Models/LikeList.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.nith.hillfair2k22.Models;

import java.util.List;

public class LikeList {
int count;
String next;
String previous;
List<User_Serializer_For_ImageFeed> result ;

public LikeList() {
}

public LikeList(int count, String next, String previous, List<User_Serializer_For_ImageFeed> result) {
this.count = count;
this.next = next;
this.previous = previous;
this.result = result;
}

public int getCount() {
return count;
}

public void setCount(int count) {
this.count = count;
}

public String getNext() {
return next;
}

public void setNext(String next) {
this.next = next;
}

public String getPrevious() {
return previous;
}

public void setPrevious(String previous) {
this.previous = previous;
}

public List<User_Serializer_For_ImageFeed> getResult() {
return result;
}

public void setResult(List<User_Serializer_For_ImageFeed> result) {
this.result = result;
}
}
50 changes: 50 additions & 0 deletions app/src/main/java/com/nith/hillfair2k22/Models/NewCommentRead.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.nith.hillfair2k22.Models;

public class NewCommentRead {
int id;
User_Serializer_For_ImageFeed author;
String text;
String posted_on;

public NewCommentRead() {
}

public NewCommentRead(int id, User_Serializer_For_ImageFeed author, String text, String posted_on) {
this.id = id;
this.author = author;
this.text = text;
this.posted_on = posted_on;
}

public int getId() {
return id;
}

public void setId(int id) {
this.id = id;
}

public User_Serializer_For_ImageFeed getAuthor() {
return author;
}

public void setAuthor(User_Serializer_For_ImageFeed author) {
this.author = author;
}

public String getText() {
return text;
}

public void setText(String text) {
this.text = text;
}

public String getPosted_on() {
return posted_on;
}

public void setPosted_on(String posted_on) {
this.posted_on = posted_on;
}
}
Loading