Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
4ee13bae
Commit
4ee13bae
authored
Nov 05, 2019
by
RAHUL SHARMA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes in MainActivity,activity_main_drawer, SubActivitiesAdapter, SubActivityFragment
parent
c6cb77e6
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
140 additions
and
12 deletions
+140
-12
app/src/main/java/app/insti/activity/MainActivity.java
app/src/main/java/app/insti/activity/MainActivity.java
+5
-0
app/src/main/java/app/insti/adapter/ActivitiesAdapter.java
app/src/main/java/app/insti/adapter/ActivitiesAdapter.java
+14
-2
app/src/main/java/app/insti/adapter/SubActivitiesAdapter.java
...src/main/java/app/insti/adapter/SubActivitiesAdapter.java
+70
-2
app/src/main/java/app/insti/fragment/BroadActivityFragment.java
...c/main/java/app/insti/fragment/BroadActivityFragment.java
+6
-1
app/src/main/java/app/insti/fragment/SubActivityFragment.java
...src/main/java/app/insti/fragment/SubActivityFragment.java
+33
-6
app/src/main/res/layout/resource_layout_sub_activities.xml
app/src/main/res/layout/resource_layout_sub_activities.xml
+2
-1
app/src/main/res/menu/activity_main_drawer.xml
app/src/main/res/menu/activity_main_drawer.xml
+10
-0
No files found.
app/src/main/java/app/insti/activity/MainActivity.java
View file @
4ee13bae
...
...
@@ -74,6 +74,7 @@ import app.insti.fragment.NotificationsFragment;
import
app.insti.fragment.PlacementBlogFragment
;
import
app.insti.fragment.QuickLinksFragment
;
import
app.insti.fragment.SettingsFragment
;
import
app.insti.fragment.SubActivityFragment
;
import
app.insti.fragment.TrainingBlogFragment
;
import
app.insti.fragment.UserFragment
;
import
app.insti.fragment.WebViewFragment
;
...
...
@@ -560,6 +561,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
updateFragment
(
new
BroadActivityFragment
());
break
;
case
R
.
id
.
nav_sub_activities
:
updateFragment
(
new
SubActivityFragment
());
break
;
case
R
.
id
.
nav_placement_blog
:
openPlacementBlog
();
break
;
...
...
app/src/main/java/app/insti/adapter/ActivitiesAdapter.java
View file @
4ee13bae
...
...
@@ -3,6 +3,7 @@ package app.insti.adapter;
import
android.app.Activity
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -12,6 +13,7 @@ import android.widget.TextView;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentActivity
;
import
androidx.fragment.app.FragmentManager
;
...
...
@@ -22,11 +24,17 @@ import com.squareup.picasso.Picasso;
import
java.util.List
;
import
app.insti.Constants
;
import
app.insti.R
;
import
app.insti.Utils
;
import
app.insti.activity.MainActivity
;
import
app.insti.api.model.BroadActivity
;
import
app.insti.api.model.Event
;
import
app.insti.fragment.BroadActivityFragment
;
import
app.insti.fragment.ExploreFragment
;
import
app.insti.fragment.FeedFragment
;
import
app.insti.fragment.SubActivityFragment
;
import
app.insti.fragment.WebViewFragment
;
public
class
ActivitiesAdapter
extends
RecyclerView
.
Adapter
<
ActivitiesAdapter
.
BroadActivitiesViewHolder
>
{
...
...
@@ -55,8 +63,12 @@ public class ActivitiesAdapter extends RecyclerView.Adapter<ActivitiesAdapter.Br
@Override
public
void
onClick
(
View
v
)
{
Toast
.
makeText
(
context
,
broadActivity
.
getBroadActivityName
()
+
" clicked"
,
Toast
.
LENGTH_SHORT
).
show
();
String
broadActivityName
=
broadActivity
.
getBroadActivityName
();
String
broadActivityImageURL
=
broadActivity
.
getAvatarUrl
();
// String broadActivityName = broadActivity.getBroadActivityName();
// String broadActivityImageURL = broadActivity.getAvatarUrl();
// AppCompatActivity activity = (AppCompatActivity) v.getContext();
//// SubActivityFragment subActivityFragment = new SubActivityFragment();
// ExploreFragment feedFragment = new ExploreFragment();
// activity.getSupportFragmentManager().beginTransaction().replace(R.id.broadActivitiesList,feedFragment).addToBackStack(null).commit();
}
});
...
...
app/src/main/java/app/insti/adapter/SubActivitiesAdapter.java
View file @
4ee13bae
package
app.insti.adapter
;
public
class
SubActivitiesAdapter
{
}
import
android.content.Context
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.ImageView
;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
androidx.annotation.NonNull
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.squareup.picasso.Picasso
;
import
java.util.List
;
import
app.insti.R
;
import
app.insti.api.model.SubActivity
;
public
class
SubActivitiesAdapter
extends
RecyclerView
.
Adapter
<
SubActivitiesAdapter
.
SubActivitiesViewHolder
>{
private
Context
context
;
private
List
<
SubActivity
>
subActivityList
;
public
SubActivitiesAdapter
(
Context
context
,
List
<
SubActivity
>
subActivityList
){
this
.
context
=
context
;
this
.
subActivityList
=
subActivityList
;
}
@NonNull
@Override
public
SubActivitiesViewHolder
onCreateViewHolder
(
@NonNull
ViewGroup
parent
,
int
viewType
)
{
LayoutInflater
inflater
=
LayoutInflater
.
from
(
context
);
View
view
=
inflater
.
inflate
(
R
.
layout
.
resource_layout_sub_activities
,
parent
,
false
);
return
new
SubActivitiesViewHolder
(
view
);
}
@Override
public
void
onBindViewHolder
(
@NonNull
SubActivitiesViewHolder
holder
,
int
position
)
{
SubActivity
subActivity
=
subActivityList
.
get
(
position
);
holder
.
txtViewSubActivityName
.
setText
(
subActivity
.
getSubActivityName
());
holder
.
txtViewSubActivityShortDescription
.
setText
(
subActivity
.
getSubActivityShortDescription
());
Picasso
.
get
().
load
(
subActivity
.
getAvatarUrl
()).
fit
().
centerCrop
().
into
(
holder
.
imgViewSubActivity
);
holder
.
linearLayoutSubActivity
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
Toast
.
makeText
(
context
,
subActivity
.
getSubActivityName
()
+
" clicked"
,
Toast
.
LENGTH_SHORT
).
show
();
}
});
}
@Override
public
int
getItemCount
()
{
return
subActivityList
.
size
();
}
public
class
SubActivitiesViewHolder
extends
RecyclerView
.
ViewHolder
{
ImageView
imgViewSubActivity
;
TextView
txtViewSubActivityName
;
TextView
txtViewSubActivityShortDescription
;
LinearLayout
linearLayoutSubActivity
;
public
SubActivitiesViewHolder
(
@NonNull
View
itemView
)
{
super
(
itemView
);
imgViewSubActivity
=
itemView
.
findViewById
(
R
.
id
.
imgViewSubActivity
);
txtViewSubActivityName
=
itemView
.
findViewById
(
R
.
id
.
txtViewSubActivityName
);
txtViewSubActivityShortDescription
=
itemView
.
findViewById
(
R
.
id
.
txtViewSubActivityShortDescription
);
linearLayoutSubActivity
=
itemView
.
findViewById
(
R
.
id
.
linearLayoutSubActivity
);
}
}
}
\ No newline at end of file
app/src/main/java/app/insti/fragment/BroadActivityFragment.java
View file @
4ee13bae
...
...
@@ -5,6 +5,7 @@ import android.net.Uri;
import
android.os.Bundle
;
import
androidx.annotation.NonNull
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.fragment.app.Fragment
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
...
...
@@ -28,6 +29,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
app.insti.R
;
import
app.insti.Utils
;
import
app.insti.adapter.ActivitiesAdapter
;
import
app.insti.api.model.BroadActivity
;
...
...
@@ -48,6 +50,10 @@ public class BroadActivityFragment extends Fragment {
Bundle
savedInstanceState
)
{
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_broad_activity
,
container
,
false
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Activities"
);
Utils
.
setSelectedMenuItem
(
getActivity
(),
R
.
id
.
nav_broad_activities
);
RecyclerView
broadActivitiesList
=
view
.
findViewById
(
R
.
id
.
broadActivitiesList
);
broadActivitiesList
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
...
...
@@ -71,7 +77,6 @@ public class BroadActivityFragment extends Fragment {
Toast
.
makeText
(
getContext
(),
"Something wrong happened"
,
Toast
.
LENGTH_SHORT
).
show
();
}
});
return
view
;
}
}
app/src/main/java/app/insti/fragment/SubActivityFragment.java
View file @
4ee13bae
package
app.insti.fragment
;
import
android.os.Bundle
;
import
android.provider.ContactsContract
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -8,26 +9,30 @@ import android.widget.Toast;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.fragment.app.Fragment
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.google.android.gms.auth.api.signin.internal.Storage
;
import
com.google.firebase.database.DataSnapshot
;
import
com.google.firebase.database.DatabaseError
;
import
com.google.firebase.database.DatabaseReference
;
import
com.google.firebase.database.FirebaseDatabase
;
import
com.google.firebase.database.ValueEventListener
;
import
com.google.firebase.storage.StorageReference
;
import
java.util.ArrayList
;
import
java.util.List
;
import
app.insti.R
;
import
app.insti.api.model.BroadActivity
;
import
app.insti.Utils
;
import
app.insti.adapter.SubActivitiesAdapter
;
import
app.insti.api.model.SubActivity
;
public
class
SubActivityFragment
extends
Fragment
{
private
StorageReference
storageReference
;
private
DatabaseReference
databaseReference
;
private
StorageReference
storageReference
2
;
private
DatabaseReference
databaseReference
2
;
private
List
<
SubActivity
>
subActivityList
;
public
SubActivityFragment
(){
...
...
@@ -39,13 +44,35 @@ public class SubActivityFragment extends Fragment {
public
View
onCreateView
(
@NonNull
LayoutInflater
inflater
,
@Nullable
ViewGroup
container
,
@Nullable
Bundle
savedInstanceState
)
{
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_sub_activity
,
container
,
false
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Sub Activities"
);
Utils
.
setSelectedMenuItem
(
getActivity
(),
R
.
id
.
nav_sub_activities
);
RecyclerView
subActivitiesList
=
view
.
findViewById
(
R
.
id
.
subActivitiesList
);
subActivitiesList
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
subActivityList
=
new
ArrayList
<>();
databaseReference
=
FirebaseDatabase
.
getInstance
().
getReference
(
"subactivities"
);
Toast
.
makeText
(
getContext
(),
"hello"
,
Toast
.
LENGTH_SHORT
).
show
();
databaseReference2
=
FirebaseDatabase
.
getInstance
().
getReference
(
"sub_activities"
);
databaseReference2
.
addValueEventListener
(
new
ValueEventListener
()
{
@Override
public
void
onDataChange
(
@NonNull
DataSnapshot
dataSnapshot
)
{
for
(
DataSnapshot
subActivitySnapshot
:
dataSnapshot
.
getChildren
()){
SubActivity
subActivity
=
subActivitySnapshot
.
getValue
(
SubActivity
.
class
);
subActivityList
.
add
(
subActivity
);
}
SubActivitiesAdapter
subActivityAdapter
=
new
SubActivitiesAdapter
(
getContext
(),
subActivityList
);
subActivitiesList
.
setAdapter
(
subActivityAdapter
);
}
@Override
public
void
onCancelled
(
@NonNull
DatabaseError
databaseError
)
{
Toast
.
makeText
(
getContext
(),
"Something wrong happened"
,
Toast
.
LENGTH_SHORT
).
show
();
}
});
return
view
;
}
...
...
app/src/main/res/layout/resource_layout_sub_activities.xml
View file @
4ee13bae
...
...
@@ -13,7 +13,8 @@
android:paddingLeft=
"18dp"
android:paddingRight=
"10dp"
android:paddingTop=
"2dp"
android:minHeight=
"80dp"
>
android:minHeight=
"80dp"
android:id=
"@+id/linearLayoutSubActivity"
>
<de.hdodenhof.circleimageview.CircleImageView
android:id=
"@+id/imgViewSubActivity"
...
...
app/src/main/res/menu/activity_main_drawer.xml
View file @
4ee13bae
...
...
@@ -23,6 +23,16 @@
android:icon=
"@drawable/ic_dashboard_black_48dp"
android:title=
"Activities"
/>
<item
android:id=
"@+id/nav_sub_activities"
android:icon=
"@drawable/ic_dashboard_black_48dp"
android:title=
"Sub Activities"
/>
<item
android:id=
"@+id/nav_events"
android:icon=
"@drawable/ic_dashboard_black_48dp"
android:title=
"Events"
/>
<item
android:id=
"@+id/nav_mess_menu"
android:icon=
"@drawable/ic_restaurant_black_48dp"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment