Commit 6ffbab0d authored by RAHUL SHARMA's avatar RAHUL SHARMA

Added Activities and Adapter

parent ef8c35ba
......@@ -72,6 +72,7 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.browser:browser:1.0.0'
implementation 'com.google.firebase:firebase-database:19.2.0'
implementation 'com.firebaseui:firebase-ui-database:0.4.0'
implementation 'com.google.firebase:firebase-analytics:17.2.1'
implementation 'com.google.firebase:firebase-auth:19.1.0'
implementation 'com.google.firebase:firebase-storage:19.1.0'
......@@ -79,6 +80,14 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.squareup.picasso:picasso:2.5.2'
// implementation 'com.ernestoyaquello.stepperform:vertical-stepper-form:2.2.2'
// implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta2"
// implementation 'com.android.support:appcompat-v7:27.1.1'
// implementation 'com.android.support.constraint:constraint-layout:1.1.2'
// testImplementation 'junit:junit:4.12'
// androidTestImplementation 'com.android.support.test:runner:1.0.2'
// androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
apply plugin: 'com.google.gms.google-services'
......@@ -9,7 +9,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-feature android:name="android.hardware.camera" />
......@@ -22,6 +22,11 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".activity.EventDescriptionActivity"></activity>
<activity android:name=".activity.CreateEventActivity" />
<activity android:name=".activity.EventActivity" />
<activity android:name=".activity.SubActivities" />
<activity android:name=".activity.BroadActivities" />
<receiver android:name=".widget.MessMenuWidget">
<intent-filter>
......
......@@ -30,6 +30,15 @@ public class SessionManager {
// Staring Login Activity
context.startActivity(i);
}
}
public String myCheckLogin() {
if (this.isLoggedIn()) {
return pref.getString(Constants.CURRENT_USER,"");
}
return null;
}
public void createLoginSession(String gcmId, User currentUser, String sessionID) {
......@@ -40,6 +49,8 @@ public class SessionManager {
editor.putString(Constants.USER_ID, currentUser.getUserID());
editor.putString(Constants.CURRENT_USER, currentUser.toString());
editor.putString(Constants.SESSION_ID, sessionID);
System.out.println("************************************");
System.out.println(currentUser.toString());
editor.commit();
}
......
package app.insti.fragment;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
package app.insti.activity;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AppCompatActivity;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.Toast;
import androidx.appcompat.widget.Toolbar;
import com.google.android.material.navigation.NavigationView;
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.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import java.util.ArrayList;
......@@ -31,52 +31,89 @@ import java.util.List;
import app.insti.R;
import app.insti.Utils;
import app.insti.adapter.ActivitiesAdapter;
import app.insti.adapter.RecyclerViewAdapter;
import app.insti.api.model.BroadActivity;
public class BroadActivityFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
public class BroadActivities extends AppCompatActivity implements ActivitiesAdapter.OnBroadActivityListener{
private static final String TAG = "BroadActivities";
private RecyclerView recyclerView;
private StorageReference storageReference;
private DatabaseReference databaseReference;
private List<BroadActivity> broadActivityList;
private List<BroadActivity> broadActivityList = new ArrayList<>();
private ActivitiesAdapter activitiesAdapter;
private ActivitiesAdapter.OnBroadActivityListener broadActivityListener;
public BroadActivityFragment() {
// Required empty public constructor
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_broad_activity, container, false);
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_broad);
recyclerView = findViewById(R.id.broadActivityRecyclerView);
initRecyclerView();
insertBroadActivities();
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Activities");
Utils.setSelectedMenuItem(getActivity(), R.id.nav_broad_activities);
// Toolbar toolbar = findViewById(R.id.toolbar1);
// toolbar.setTitle("Activities");
// Utils.setSelectedMenuItem(this, R.id.nav_broad_activities);
RecyclerView broadActivitiesList = view.findViewById(R.id.broadActivitiesList);
broadActivitiesList.setLayoutManager(new LinearLayoutManager(getContext()));
}
broadActivityList = new ArrayList<>();
private void initRecyclerView() {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(linearLayoutManager);
broadActivityListener = this;
activitiesAdapter = new ActivitiesAdapter(broadActivityList,this);
recyclerView.setAdapter(activitiesAdapter);
databaseReference = FirebaseDatabase.getInstance().getReference("activities");
setSupportActionBar(findViewById(R.id.toolbar));
setTitle("Activities");
}
private void insertBroadActivities(){
// broadActivityList = new ArrayList<>();
// for(int i=0;i<3;i++){
// BroadActivity broadActivity = new BroadActivity();
// broadActivity.setBroadActivityName("Activity"+i);
// broadActivity.setBroadActivityImageURL("https://firebasestorage.googleapis.com/v0/b/insticonnect-45378.appspot.com/o/broadActivityImages%2Fadventures.jpg?alt=media&token=3077eaf3-abe5-4b72-9205-1702e8887bb6");
// broadActivityList.add(broadActivity);
// }
databaseReference = FirebaseDatabase.getInstance().getReference("activities");
databaseReference.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
public void onDataChange(DataSnapshot dataSnapshot) {
// This method is called once with the initial value and again
// whenever data at this location is updated.
for(DataSnapshot activitySnapshot : dataSnapshot.getChildren()){
BroadActivity broadActivity = activitySnapshot.getValue(BroadActivity.class);
broadActivityList.add(broadActivity);
}
ActivitiesAdapter broadActivityAdapter = new ActivitiesAdapter(getContext(),broadActivityList);
broadActivitiesList.setAdapter(broadActivityAdapter);
ActivitiesAdapter broadActivityAdapter = new ActivitiesAdapter(broadActivityList,broadActivityListener);
recyclerView.setAdapter(broadActivityAdapter);
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
Toast.makeText(getContext(),"Something wrong happened", Toast.LENGTH_SHORT).show();
public void onCancelled(DatabaseError error) {
// Failed to read value
Log.w(TAG, "Failed to read value.", error.toException());
}
});
return view;
// activitiesAdapter.notifyDataSetChanged();
}
@Override
protected void onStart() {
super.onStart();
}
@Override
public void onBroadActivityClick(int position) {
Intent intent = new Intent(this,SubActivities.class);
intent.putExtra("broadActivityNameClicked",broadActivityList.get(position).getBroadActivityID());
startActivity(intent);
}
}
package app.insti.activity;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity;
import android.content.ContentResolver;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
import android.util.Log;
import android.view.View;
import android.webkit.MimeTypeMap;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.Toast;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.OnProgressListener;
import com.google.firebase.storage.StorageReference;
import com.google.firebase.storage.UploadTask;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.UUID;
import app.insti.R;
import app.insti.api.model.MyEvent;
public class CreateEventActivity extends AppCompatActivity {
private EditText eventName;
private EditText eventVenue;
private EditText eventDescription;
private EditText eventTime;
private EditText eventDate;
private ImageView eventImage;
private Button eventSubmit;
// private Button uploadImage;
private Button chooseImage;
private ImageView imageView;
private final int PICK_IMAGE_REQUEST = 7;
private Uri filePath;
private StorageReference storageReference;
private DatabaseReference databaseReference;
private FirebaseStorage firebaseStorage;
private String event_image_url;
private static final String TAG = "Create Activity";
private FirebaseAuth mAuth;
private String eventIdCreated;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_create_event);
eventName = findViewById(R.id.event_name);
eventVenue = findViewById(R.id.event_venue);
eventTime = findViewById(R.id.event_time);
eventDate = findViewById(R.id.event_date);
eventDescription = findViewById(R.id.event_description);
eventSubmit = findViewById(R.id.event_submit);
chooseImage = findViewById(R.id.img_choose);
// uploadImage = findViewById(R.id.img_upload);
imageView = findViewById(R.id.show_image);
databaseReference = FirebaseDatabase.getInstance().getReference("my_events");
storageReference = FirebaseStorage.getInstance().getReference();
mAuth = FirebaseAuth.getInstance();
eventSubmit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
String name = eventName.getText().toString();
String venue = eventVenue.getText().toString();
String date = eventDate.getText().toString();
String time = eventTime.getText().toString();
String description = eventDescription.getText().toString();
int going = 0;
int interested = 0;
String id = "event"+Math.random();
// String url = "https://firebasestorage.googleapis.com/v0/b/insticonnect-45378.appspot.com/o/eventImages%2Fsameer_hill.jpg?alt=media&token=fe0d8eaa-2a36-49a2-9456-1c67c0c3b283";
String parent = "hanging_out";
// createNewEvent(name,venue,date,time,description,going,interested,id,parent,url);
createNewEvent(name,venue,date,time,description,going,interested,id,parent);
uploadImage(name);
// String url = fetchUrl(name);
// System.out.println("*********************bahar***********************************");
// System.out.println(url);
// System.out.println("********************************************************");
}
});
chooseImage.setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
@Override
public void onClick(View v) {
chooseImage();
}
});
// uploadImage.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
//
// }
// });
}
@Override
protected void onStart() {
super.onStart();
FirebaseUser currentUser = mAuth.getCurrentUser();
signInAnonymously();
}
private void uploadImage(String name) {
if (filePath != null) {
StorageReference ref = storageReference.child("eventImages/"+name);
ref.putFile(filePath).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception e) {
Toast.makeText(getApplicationContext(),"Failed Upload", Toast.LENGTH_SHORT).show();
}
});
}
}
private void signInAnonymously() {
// [START signin_anonymously]
mAuth.signInAnonymously()
.addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
@Override
public void onComplete(@NonNull Task<AuthResult> task) {
if (task.isSuccessful()) {
// Sign in success, update UI with the signed-in user's information
Log.d(TAG, "signInAnonymously:success");
FirebaseUser user = mAuth.getCurrentUser();
} else {
// If sign in fails, display a message to the user.
Log.w(TAG, "signInAnonymously:failure", task.getException());
}
}
});
// [END signin_anonymously]
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
private void chooseImage() {
Intent intent = new Intent();
intent.setType("image/*");
intent.setAction(Intent.ACTION_GET_CONTENT);
startActivityForResult(Intent.createChooser(intent,"Select Picture"),PICK_IMAGE_REQUEST);
}
private void createNewEvent(String name, String venue, String date, String time, String description, int going, int interested, String id, String parent) {
MyEvent myEvent = new MyEvent(name,venue,date,time,description,going,interested,parent,id);
String eventId = databaseReference.push().getKey();
databaseReference.child(eventId).setValue(myEvent);
eventIdCreated = eventId;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if(requestCode == PICK_IMAGE_REQUEST && resultCode == RESULT_OK && data !=null && data.getData() != null){
filePath = data.getData();
try{
Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(),filePath);
imageView.setVisibility(View.VISIBLE);
imageView.setImageBitmap(bitmap);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
package app.insti.activity;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Toast;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
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.adapter.MyEventAdapter;
import app.insti.adapter.SubActivitiesAdapter;
import app.insti.api.model.MyEvent;
import app.insti.api.model.SubActivity;
public class EventActivity extends AppCompatActivity implements MyEventAdapter.OnMyEventListener {
private static final String TAG = "Events";
private RecyclerView recyclerView;
private StorageReference storageReference;
private DatabaseReference databaseReference;
private List<MyEvent> myEventList = new ArrayList<>();
private MyEventAdapter myEventAdapter;
private MyEventAdapter.OnMyEventListener myEventListener;
private String subActivityNameClicked;
private FloatingActionButton floatingActionButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Toast.makeText(getApplicationContext(),getIntent().getStringExtra("subActivityNameClicked"),Toast.LENGTH_SHORT).show();
setContentView(R.layout.activity_event);
recyclerView = findViewById(R.id.myEventRecyclerView);
floatingActionButton = findViewById(R.id.add_event);
subActivityNameClicked = getIntent().getStringExtra("subActivityNameClicked");
initRecyclerView();
insertMyEvents();
floatingActionButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(EventActivity.this,CreateEventActivity.class);
startActivity(intent);
}
});
}
private void insertMyEvents() {
databaseReference = FirebaseDatabase.getInstance().getReference("my_events");
databaseReference.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(DataSnapshot dataSnapshot) {
// This method is called once with the initial value and again
// whenever data at this location is updated.
for(DataSnapshot activitySnapshot : dataSnapshot.getChildren()){
MyEvent myEvent = activitySnapshot.getValue(MyEvent.class);
String myEventParent = myEvent.getMyEventParent();
if(myEventParent.equals(subActivityNameClicked)) {
myEventList.add(myEvent);
}
}
MyEventAdapter myEventAdapter = new MyEventAdapter(myEventList,myEventListener);
recyclerView.setAdapter(myEventAdapter);
}
@Override
public void onCancelled(DatabaseError error) {
// Failed to read value
Log.w(TAG, "Failed to read value.", error.toException());
}
});
}
private void initRecyclerView() {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(linearLayoutManager);
myEventListener = this;
myEventAdapter = new MyEventAdapter(myEventList,myEventListener);
recyclerView.setAdapter(myEventAdapter);
setSupportActionBar(findViewById(R.id.toolbar));
setTitle("Sub Activities");
}
@Override
public void onMyEventClick(int position) {
// Toast.makeText(getApplicationContext(),"message",Toast.LENGTH_SHORT).show();
Intent intent = new Intent(this,EventDescriptionActivity.class);
intent.putExtra("eventNameClicked",myEventList.get(position).getMyEventID());
startActivity(intent);
}
}
package app.insti.activity;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.media.Image;
import android.os.Bundle;
import android.util.Log;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
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 com.squareup.picasso.Picasso;
import app.insti.R;
import app.insti.adapter.ActivitiesAdapter;
import app.insti.adapter.MyEventAdapter;
import app.insti.adapter.RecyclerViewAdapter;
import app.insti.api.model.MyEvent;
public class EventDescriptionActivity extends AppCompatActivity {
private static final String TAG = "Clicked Event";
private static MyEvent eventClicked = new MyEvent();
private StorageReference storageReference;
private DatabaseReference databaseReference;
private String eventNameClicked;
private TextView eventTitle;
private ImageView eventImage;
private TextView eventDate;
private TextView eventDescription;
private RecyclerView recyclerView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_event_description);
// Toast.makeText(getApplicationContext(),getIntent().getStringExtra("eventNameClicked"), Toast.LENGTH_SHORT).show();
eventNameClicked = getIntent().getStringExtra("eventNameClicked");
initRecyclerView();
fetchEventDescription();
// displayEventDescription();
}
private void initRecyclerView() {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(linearLayoutManager);
// myEventAdapter = new MyEventAdapter();
// recyclerView.setAdapter(myEventAdapter);
setSupportActionBar(findViewById(R.id.toolbar));
setTitle("Clicked Event");
}
private void displayEventDescription() {
System.out.println("************************************************");
System.out.println(eventClicked.getMyEventName());
System.out.println(eventClicked.getMyEventDescription());
System.out.println(eventClicked.getAvatarUrl());
System.out.println(eventClicked.getMyEventGoingCount());
System.out.println(eventClicked.getMyEventInterestedCount());
System.out.println(eventClicked.getMyEventStartTime());
System.out.println(eventClicked.getMyEventEndTime());
System.out.println(eventClicked.getMyEventVenues());
System.out.println("************************************************");
}
private void updateEventDetails(){
eventTitle = findViewById(R.id.event_page_title);
eventImage = findViewById(R.id.event_picture_2);
eventDate = findViewById(R.id.event_page_date);
eventDescription = findViewById(R.id.event_page_description);
eventTitle.setText(eventClicked.getMyEventName());
eventDate.setText(eventClicked.getMyEventStartTime());
eventDescription.setText(eventClicked.getMyEventDescription());
Picasso.get().load(eventClicked.getAvatarUrl()).fit().centerCrop().into(eventImage);
}
private void fetchEventDescription() {
databaseReference = FirebaseDatabase.getInstance().getReference("my_events");
databaseReference.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(DataSnapshot dataSnapshot) {
// This method is called once with the initial value and again
// whenever data at this location is updated.
for(DataSnapshot activitySnapshot : dataSnapshot.getChildren()){
MyEvent myEvent = activitySnapshot.getValue(MyEvent.class);
String myEventID = myEvent.getMyEventID();
if(myEventID.equals(eventNameClicked)){
eventClicked = myEvent;
// displayEventDescription();
updateEventDetails();
break;
}
}
}
@Override
public void onCancelled(DatabaseError error) {
// Failed to read value
Log.w(TAG, "Failed to read value.", error.toException());
}
});
}
}
......@@ -47,7 +47,7 @@ import java.net.URL;
import java.util.List;
import app.insti.Constants;
import app.insti.fragment.MyEventFragment;
import app.insti.fragment.CreateEventFragment;
import app.insti.R;
import app.insti.SessionManager;
import app.insti.UpdatableList;
......@@ -62,7 +62,6 @@ import app.insti.api.model.Role;
import app.insti.api.model.User;
import app.insti.api.request.UserFCMPatchRequest;
import app.insti.fragment.BackHandledFragment;
import app.insti.fragment.BroadActivityFragment;
import app.insti.fragment.CalendarFragment;
import app.insti.fragment.ComplaintsFragment;
import app.insti.fragment.ExploreFragment;
......@@ -75,7 +74,6 @@ 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;
......@@ -105,6 +103,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private User currentUser;
private BackHandledFragment selectedFragment;
private Menu menu;
// protected DrawerLayout drawer;
public static void hideKeyboard(Activity activity) {
InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
......@@ -148,7 +147,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
// DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); // modified
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
drawer.addDrawerListener(toggle);
......@@ -559,20 +559,24 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
break;
case R.id.nav_broad_activities:
updateFragment(new BroadActivityFragment());
break;
case R.id.nav_sub_activities:
updateFragment(new SubActivityFragment());
// updateFragment(new BroadActivityFragment());
Intent intent = new Intent(this, BroadActivities.class);
startActivity(intent);
break;
case R.id.nav_my_events:
updateFragment(new MyEventFragment());
break;
case R.id.nav_add_my_events:
updateFragment(new MyEventFragment());
break;
// case R.id.nav_sub_activities:
// Intent intent2 = new Intent(this, SubActivities.class);
// startActivity(intent2);
// break;
//
// case R.id.nav_my_events:
// intent2 = new Intent(this, SubActivities.class);
// startActivity(intent2);
// break;
//
// case R.id.nav_add_my_events:
// updateFragment(new CreateEventFragment());
// break;
case R.id.nav_placement_blog:
......
package app.insti.activity;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
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.adapter.ActivitiesAdapter;
import app.insti.adapter.SubActivitiesAdapter;
import app.insti.api.model.BroadActivity;
import app.insti.api.model.SubActivity;
public class SubActivities extends AppCompatActivity implements SubActivitiesAdapter.OnSubActivityListener {
private static final String TAG = "SubActivities";
private RecyclerView recyclerView;
private StorageReference storageReference;
private DatabaseReference databaseReference;
private List<SubActivity> subActivityList = new ArrayList<>();
private SubActivitiesAdapter subActivitiesAdapter;
private SubActivitiesAdapter.OnSubActivityListener subActivityListener;
private String broadActivityNameClicked;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sub);
// Toast.makeText(getApplicationContext(),"subactivity",Toast.LENGTH_SHORT).show();
// Toast.makeText(getApplicationContext(),getIntent().getStringExtra("message"),Toast.LENGTH_SHORT).show();
recyclerView = findViewById(R.id.subActivityRecyclerView);
broadActivityNameClicked = getIntent().getStringExtra("broadActivityNameClicked");
initRecyclerView();
insertSubActivities();
}
private void insertSubActivities() {
databaseReference = FirebaseDatabase.getInstance().getReference("sub_activities");
databaseReference.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(DataSnapshot dataSnapshot) {
// This method is called once with the initial value and again
// whenever data at this location is updated.
for(DataSnapshot activitySnapshot : dataSnapshot.getChildren()){
SubActivity subActivity = activitySnapshot.getValue(SubActivity.class);
String subActivityParent = subActivity.getSubActivityParent();
if(subActivityParent.equals(broadActivityNameClicked)) {
subActivityList.add(subActivity);
}
}
SubActivitiesAdapter subActivityAdapter = new SubActivitiesAdapter(subActivityList,subActivityListener);
recyclerView.setAdapter(subActivityAdapter);
}
@Override
public void onCancelled(DatabaseError error) {
// Failed to read value
Log.w(TAG, "Failed to read value.", error.toException());
}
});
}
private void initRecyclerView() {
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(linearLayoutManager);
subActivityListener = this;
subActivitiesAdapter = new SubActivitiesAdapter(subActivityList,subActivityListener);
recyclerView.setAdapter(subActivitiesAdapter);
setSupportActionBar(findViewById(R.id.toolbar));
setTitle("Sub Activities");
}
@Override
public void onSubActivityClick(int position) {
Intent intent = new Intent(this,EventActivity.class);
intent.putExtra("subActivityNameClicked",subActivityList.get(position).getSubActivityID());
startActivity(intent);
}
}
......@@ -11,6 +11,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import app.insti.Utils;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
......@@ -22,36 +23,28 @@ import androidx.recyclerview.widget.RecyclerView;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
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> {
private Context context;
private List<BroadActivity> broadActivityList;
private List<BroadActivity> broadActivityList = new ArrayList<>();
private OnBroadActivityListener onBroadActivityListener;
public ActivitiesAdapter(Context context,List<BroadActivity> broadActivityList){
this.context = context;
public ActivitiesAdapter(List<BroadActivity> broadActivityList,OnBroadActivityListener onBroadActivityListener){
this.broadActivityList = broadActivityList;
this.onBroadActivityListener = onBroadActivityListener;
}
@NonNull
@Override
public BroadActivitiesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = LayoutInflater.from(context);
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
View view = inflater.inflate(R.layout.resource_layout_broad_activities,parent,false);
return new BroadActivitiesViewHolder(view);
return new BroadActivitiesViewHolder(view,onBroadActivityListener);
}
@Override
......@@ -59,19 +52,6 @@ public class ActivitiesAdapter extends RecyclerView.Adapter<ActivitiesAdapter.Br
BroadActivity broadActivity = broadActivityList.get(position);
holder.txtView.setText(broadActivity.getBroadActivityName());
Picasso.get().load(broadActivity.getAvatarUrl()).fit().centerCrop().into(holder.imgView);
holder.linearLayoutActivity.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(context, broadActivity.getBroadActivityName() + " clicked", Toast.LENGTH_SHORT).show();
// 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();
}
});
}
@Override
......@@ -79,16 +59,32 @@ public class ActivitiesAdapter extends RecyclerView.Adapter<ActivitiesAdapter.Br
return broadActivityList.size();
}
public class BroadActivitiesViewHolder extends RecyclerView.ViewHolder {
public class BroadActivitiesViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
ImageView imgView;
TextView txtView;
LinearLayout linearLayoutActivity;
public BroadActivitiesViewHolder(@NonNull View itemView) {
OnBroadActivityListener onBroadActivityListener;
public BroadActivitiesViewHolder(@NonNull View itemView, OnBroadActivityListener onBroadActivityListener) {
super(itemView);
imgView = itemView.findViewById(R.id.imgViewActivity);
txtView = itemView.findViewById(R.id.txtViewActivity);
linearLayoutActivity = itemView.findViewById(R.id.linearLayoutActivity);
this.onBroadActivityListener = onBroadActivityListener;
itemView.setOnClickListener(this);
}
@Override
public void onClick(View v) {
System.out.println("*************************************************");
System.out.println(getAdapterPosition());
System.out.println("*************************************************");
onBroadActivityListener.onBroadActivityClick(getAdapterPosition());
}
}
public interface OnBroadActivityListener{
void onBroadActivityClick(int position);
}
}
......@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import app.insti.R;
......@@ -22,20 +23,20 @@ import app.insti.api.model.SubActivity;
public class MyEventAdapter extends RecyclerView.Adapter<MyEventAdapter.MyEventViewHolder> {
private Context context;
private List<MyEvent> myEventList;
private List<MyEvent> myEventList = new ArrayList<>();
private OnMyEventListener onMyEventListener;
public MyEventAdapter(Context context, List<MyEvent> myEventList) {
this.context = context;
public MyEventAdapter(List<MyEvent> myEventList,OnMyEventListener onMyEventListener) {
this.myEventList = myEventList;
this.onMyEventListener = onMyEventListener;
}
@NonNull
@Override
public MyEventViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = LayoutInflater.from(context);
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
View view = inflater.inflate(R.layout.resource_layout_my_events,parent,false);
return new MyEventViewHolder(view);
return new MyEventViewHolder(view,onMyEventListener);
}
@Override
......@@ -44,12 +45,6 @@ public class MyEventAdapter extends RecyclerView.Adapter<MyEventAdapter.MyEventV
holder.txtViewMyEventName.setText(myEvent.getMyEventName());
holder.txtViewMyEventShortDescription.setText(myEvent.getMyEventDescription());
Picasso.get().load(myEvent.getAvatarUrl()).fit().centerCrop().into(holder.imgViewMyEvent);
holder.linearLayoutMyEvent.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(context, myEvent.getMyEventName() + " clicked", Toast.LENGTH_SHORT).show();
}
});
}
......@@ -58,18 +53,32 @@ public class MyEventAdapter extends RecyclerView.Adapter<MyEventAdapter.MyEventV
return myEventList.size();
}
public class MyEventViewHolder extends RecyclerView.ViewHolder {
public class MyEventViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
ImageView imgViewMyEvent;
TextView txtViewMyEventName;
TextView txtViewMyEventShortDescription;
LinearLayout linearLayoutMyEvent;
OnMyEventListener onMyEventListener;
public MyEventViewHolder(@NonNull View itemView) {
public MyEventViewHolder(@NonNull View itemView,OnMyEventListener onMyEventListener) {
super(itemView);
imgViewMyEvent = itemView.findViewById(R.id.imgViewMyEvent);
txtViewMyEventName = itemView.findViewById(R.id.txtViewMyEventName);
txtViewMyEventShortDescription = itemView.findViewById(R.id.txtViewMyEventShortDescription);
linearLayoutMyEvent = itemView.findViewById(R.id.linearLayoutMyEvent);
this.onMyEventListener = onMyEventListener;
itemView.setOnClickListener(this);
}
@Override
public void onClick(View v) {
onMyEventListener.onMyEventClick(getAdapterPosition());
}
}
public interface OnMyEventListener{
void onMyEventClick(int position);
}
}
......@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import app.insti.R;
......@@ -21,20 +22,21 @@ import app.insti.api.model.SubActivity;
public class SubActivitiesAdapter extends RecyclerView.Adapter<SubActivitiesAdapter.SubActivitiesViewHolder>{
private Context context;
private List<SubActivity> subActivityList;
private List<SubActivity> subActivityList = new ArrayList<>();
private OnSubActivityListener onSubActivityListener;
public SubActivitiesAdapter(Context context,List<SubActivity> subActivityList){
this.context = context;
public SubActivitiesAdapter(List<SubActivity> subActivityList,OnSubActivityListener onSubActivityListener){
this.subActivityList = subActivityList;
this.onSubActivityListener = onSubActivityListener;
}
@NonNull
@Override
public SubActivitiesViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = LayoutInflater.from(context);
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
View view = inflater.inflate(R.layout.resource_layout_sub_activities,parent,false);
return new SubActivitiesViewHolder(view);
return new SubActivitiesViewHolder(view,onSubActivityListener);
}
@Override
......@@ -43,12 +45,6 @@ public class SubActivitiesAdapter extends RecyclerView.Adapter<SubActivitiesAdap
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
......@@ -56,17 +52,30 @@ public class SubActivitiesAdapter extends RecyclerView.Adapter<SubActivitiesAdap
return subActivityList.size();
}
public class SubActivitiesViewHolder extends RecyclerView.ViewHolder{
public class SubActivitiesViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
ImageView imgViewSubActivity;
TextView txtViewSubActivityName;
TextView txtViewSubActivityShortDescription;
LinearLayout linearLayoutSubActivity;
public SubActivitiesViewHolder(@NonNull View itemView) {
OnSubActivityListener onSubActivityListener;
public SubActivitiesViewHolder(@NonNull View itemView, OnSubActivityListener onSubActivityListener) {
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);
this.onSubActivityListener = onSubActivityListener;
itemView.setOnClickListener(this);
}
@Override
public void onClick(View v) {
onSubActivityListener.onSubActivityClick(getAdapterPosition());
}
}
public interface OnSubActivityListener{
void onSubActivityClick(int position);
}
}
\ No newline at end of file
......@@ -36,6 +36,10 @@ public class BroadActivity implements CardInterface {
return broadActivityChildren;
}
public BroadActivity() {
}
public void setBroadActivityID(String broadActivityID) {
this.broadActivityID = broadActivityID;
}
......
......@@ -65,6 +65,23 @@ public class MyEvent implements CardInterface {
@SerializedName("going")
private List<User> myEventGoing;
public MyEvent() {
}
public MyEvent(String name, String venue, String date, String time, String description, int going, int interested, String parent, String id){
this.myEventName = name;
this.myEventVenues = venue;
this.myEventStartTime = date;
this.myEventEndTime = time;
this.myEventDescription = description;
this.myEventID = id;
this.myEventGoingCount = going;
this.myEventInterestedCount = interested;
this.myEventParent = parent;
// this.myEventImageURL = url;
}
@NonNull
public String getMyEventID() {
return myEventID;
......
......@@ -24,7 +24,7 @@ public class SubActivity implements CardInterface {
private String subActivityDescription;
@SerializedName("parent")
private BroadActivity subActivityParents;
private String subActivityParent;
@SerializedName("children")
private List<NewEvent> subActivityChildren;
......@@ -51,8 +51,8 @@ public class SubActivity implements CardInterface {
return subActivityChildren;
}
public BroadActivity getSubActivityParents() {
return subActivityParents;
public String getSubActivityParent() {
return subActivityParent;
}
public String getSubActivityShortDescription() {
......@@ -75,8 +75,8 @@ public class SubActivity implements CardInterface {
this.subActivityChildren = subActivityChildren;
}
public void setSubActivityParents(BroadActivity subActivityParents) {
this.subActivityParents = subActivityParents;
public void setSubActivityParent(String subActivityParent) {
this.subActivityParent = subActivityParent;
}
public String getSubActivityDescription() {
......
package app.insti.fragment;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import app.insti.R;
public class CreateEventFragment extends Fragment {
public CreateEventFragment() {
// Required empty public constructor
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
Toast.makeText(getContext(),"messgae",Toast.LENGTH_LONG).show();
return inflater.inflate(R.layout.fragment_create_event, container, false);
}
}
package app.insti.fragment;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
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 android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.Toast;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
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.Utils;
import app.insti.adapter.MyEventAdapter;
import app.insti.adapter.SubActivitiesAdapter;
import app.insti.api.model.MyEvent;
import app.insti.api.model.SubActivity;
public class MyEventFragment extends Fragment {
private StorageReference storageReference3;
private DatabaseReference databaseReference3;
private List<MyEvent> myEventList;
private FloatingActionButton add_event;
public MyEventFragment(){
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_my_event, container, false);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("My Events");
Utils.setSelectedMenuItem(getActivity(), R.id.nav_my_events);
RecyclerView myEventsList = view.findViewById(R.id.myEventList);
myEventsList.setLayoutManager(new LinearLayoutManager(getContext()));
myEventList = new ArrayList<>();
databaseReference3 = FirebaseDatabase.getInstance().getReference("my_events");
databaseReference3.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot myEventSnapshot : dataSnapshot.getChildren()){
MyEvent myEvent = myEventSnapshot.getValue(MyEvent.class);
myEventList.add(myEvent);
}
MyEventAdapter myEventAdapter = new MyEventAdapter(getContext(),myEventList);
myEventsList.setAdapter(myEventAdapter);
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
Toast.makeText(getContext(),"Something wrong happened", Toast.LENGTH_SHORT).show();
}
});
add_event = view.findViewById(R.id.add_event);
add_event.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(getContext(), "Add Event Clicked", Toast.LENGTH_SHORT).show();
}
});
return view;
}
}
package app.insti.fragment;
import android.os.Bundle;
import android.provider.ContactsContract;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
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.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.Utils;
import app.insti.adapter.SubActivitiesAdapter;
import app.insti.api.model.SubActivity;
public class SubActivityFragment extends Fragment {
private StorageReference storageReference2;
private DatabaseReference databaseReference2;
private List<SubActivity> subActivityList;
public SubActivityFragment(){
}
@Nullable
@Override
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<>();
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;
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="@color/dark_blue"
android:endColor="@color/purple"
android:angle="-135" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<stroke android:color="@color/login_form_details" android:width="2dp"/>
<corners android:radius="2dp" />
</shape>
</item>
<item>
<shape>
<stroke android:color="@color/login_form_details_light" android:width="2dp"/>
<corners android:radius="2dp" />
</shape>
</item>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/login_form_details_light" />
<corners android:radius="2dp"/>
</shape>
\ No newline at end of file
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ccffffff"
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
</vector>
<vector android:height="60dp" android:viewportHeight="32.0"
android:viewportWidth="32.0" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff" android:pathData="M11.49,0c-7.61,0 -11.49,4.38 -11.49,12.56v0,17.16l7.45,-7.46v-8.72c0,-3.39 0.9,-5.54 3.91,-6.03v0c1.05,-0.21 3.24,-0.13 4.64,-0.13v0,5.18c0,0.05 0.01,0.13 0.02,0.17v0c0.06,0.21 0.25,0.36 0.47,0.36v0c0.13,0 0.25,-0.07 0.37,-0.19v0l12.91,-12.9 -18.28,-0zM24.55,9.74v8.72c0,3.39 -0.9,5.54 -3.91,6.03v0c-1.05,0.21 -3.24,0.13 -4.64,0.13v0,-5.18c0,-0.05 -0.01,-0.13 -0.02,-0.17v0c-0.06,-0.21 -0.25,-0.36 -0.47,-0.36v0c-0.13,0 -0.25,0.07 -0.37,0.19v0l-12.91,12.9 18.28,0c7.61,0 11.49,-4.38 11.49,-12.56v0,-17.16l-7.45,7.46z"/>
</vector>
<vector android:height="24dp" android:viewportHeight="32.0"
android:viewportWidth="32.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff" android:pathData="M32,30c0,1.1 -0.9,2 -2,2H2c-1.1,0 -2,-0.9 -2,-2V2c0,-1.1 0.9,-2 2,-2h28c1.1,0 2,0.9 2,2V30z"/>
<path android:fillColor="#c86dd7" android:pathData="M22,32V20h4l1,-5h-5v-2c0,-2 1,-3 3,-3h2V5c-1,0 -2.24,0 -4,0c-3.67,0 -6,2.88 -6,7v3h-4v5h4v12H22z"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
</vector>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.BroadActivityFragment">
tools:context=".activity.BroadActivities">
<!-- TODO: Update blank fragment layout -->
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/broadActivitiesList">
android:id="@+id/broadActivityRecyclerView"/>
</androidx.recyclerview.widget.RecyclerView>
</FrameLayout>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:fillViewport="true"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_create_event"
tools:context=".activity.CreateEventActivity">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="24dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_end="24dp" />
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:contentDescription="logo"
android:src="@drawable/insti"
app:layout_constraintEnd_toStartOf="@+id/guideline_right"
app:layout_constraintStart_toStartOf="@+id/guideline_left"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/event_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/et_bg"
android:layout_marginTop="30dp"
android:hint="Event Name"
android:inputType="text"
android:padding="16dp"
android:textColorHint="@color/login_form_details"
app:layout_constraintEnd_toStartOf="@id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_left"
app:layout_constraintTop_toBottomOf="@+id/icon" />
<EditText
android:id="@+id/event_venue"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:background="@drawable/et_bg"
android:hint="Event Venue"
android:inputType="text"
android:padding="16dp"
android:textColorHint="@color/login_form_details"
app:layout_constraintEnd_toStartOf="@id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_left"
app:layout_constraintTop_toBottomOf="@+id/event_name" />
<EditText
android:id="@+id/event_time"
android:layout_width="361dp"
android:layout_height="53dp"
android:ems="10"
android:hint="Time"
android:layout_marginTop="30dp"
android:inputType="time"
app:layout_constraintEnd_toStartOf="@id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_left"
app:layout_constraintTop_toBottomOf="@+id/event_venue" />
<EditText
android:id="@+id/event_date"
android:layout_width="361dp"
android:layout_height="54dp"
android:ems="10"
android:hint="Date"
android:inputType="date"
android:layout_marginTop="30dp"
app:layout_constraintEnd_toStartOf="@id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_left"
app:layout_constraintTop_toBottomOf="@+id/event_time" />
<EditText
android:id="@+id/event_description"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:background="@drawable/et_bg"
android:hint="Description"
android:inputType="textMultiLine"
android:lines="6"
android:padding="16dp"
android:textColorHint="@color/login_form_details"
app:layout_constraintEnd_toStartOf="@id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@id/guideline_left"
app:layout_constraintTop_toBottomOf="@+id/event_date" />
<Button
android:id="@+id/img_choose"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:background="@drawable/btn_bg"
android:text="Choose Image"
android:textAllCaps="false"
android:textColor="@color/login_form_details_medium"
app:layout_constraintEnd_toStartOf="@+id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/guideline_left"
app:layout_constraintTop_toBottomOf="@id/event_description"
/>
<ImageView
android:id="@+id/show_image"
android:layout_width="300dp"
android:layout_height="300dp"
android:src="@drawable/insti"
android:layout_marginTop="30dp"
app:layout_constraintEnd_toStartOf="@+id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/guideline_left"
app:layout_constraintTop_toBottomOf="@id/img_choose"
android:visibility="gone"
/>
<Button
android:id="@+id/img_upload"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:background="@drawable/btn_bg"
android:text="Upload Image"
android:textAllCaps="false"
android:textColor="@color/login_form_details_medium"
app:layout_constraintEnd_toStartOf="@+id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/guideline_left"
app:layout_constraintTop_toBottomOf="@id/show_image"
android:visibility="gone"
/>
<Button
android:id="@+id/event_submit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:background="@drawable/btn_bg"
android:text="SUBMIT"
android:textAllCaps="false"
android:textColor="@color/login_form_details_medium"
app:layout_constraintEnd_toStartOf="@+id/guideline_right"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/guideline_left"
app:layout_constraintTop_toBottomOf="@id/img_upload"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.EventActivity"
>
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/myEventRecyclerView"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_event"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_edit_black_24dp"
android:tint="@android:color/black"
android:visibility="visible"
/>
</FrameLayout>
\ No newline at end of file
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.SubActivities">
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/subActivityRecyclerView"/>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="date"
type="String" />
<variable
name="label"
type="String"/>
</data>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/spacing_extra_small"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{ label }" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="Date and Time"
app:srcCompat="@drawable/baseline_comment_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_extra_small"
android:orientation="horizontal"
>
<com.eventyay.organizer.ui.views.DatePicker
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/purple_500"
/>
<com.eventyay.organizer.ui.views.TimePicker
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_500"
/>
</LinearLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_extra_small"
>
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@{ label }"
android:inputType="datetime"
/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>
</layout>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.CreateEventFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
style="@style/ItemPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="@dimen/spacing_large">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="Create Event"
android:padding="@dimen/spacing_extra_small"
android:src="@drawable/baseline_comment_24" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_small"
android:padding="@dimen/spacing_extra_small">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Event Name"
android:inputType="textMultiLine"
/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_big"
android:layout_marginLeft="@dimen/spacing_big"
android:orientation="vertical"
android:padding="@dimen/spacing_extra_small">
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:background="?android:attr/selectableItemBackground"
android:ellipsize="end"
android:maxLines="2"
android:padding="@dimen/spacing_small" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_normal"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:showDividers="beginning">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:padding="@dimen/spacing_extra_small"
android:text="Date and Time"
android:textSize="@dimen/text_size_normal"
android:textStyle="bold" />
<include
layout="@layout/starts_at_time_picker"
/>
<include
layout="@layout/ends_at_time_picker"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_normal"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:showDividers="beginning">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_extra_small"
android:layout_marginLeft="@dimen/spacing_extra_small"
android:layout_marginTop="@dimen/spacing_normal"
android:divider="?android:dividerHorizontal"
android:showDividers="beginning"
android:text="Location Details"
android:textSize="@dimen/text_size_normal"
android:textStyle="bold" />
<Button
android:id="@+id/select_location_button"
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_extra_small"
android:text="Select Location"
android:textColor="@color/purple_500" />
<LinearLayout
android:id="@+id/layout_location_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/spacing_extra_small"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="Location Name"
android:padding="@dimen/spacing_extra_small"
android:src="@drawable/baseline_comment_24" />
<TextView
android:id="@+id/location_name"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_normal"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:padding="@dimen/spacing_medium">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_normal"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:showDividers="beginning">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:padding="@dimen/spacing_extra_small"
android:text="Image"
android:textSize="@dimen/text_size_normal"
android:textStyle="bold" />
<FrameLayout
android:id="@+id/logo_image_layout"
android:layout_width="match_parent"
android:layout_height="200dp"
android:background="@color/grey_600"
android:layout_margin="10dp">
<ImageView
android:id="@+id/logo_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:src="@drawable/baseline_comment_24"
android:layout_gravity="center"
android:contentDescription="Add logo image" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
......@@ -10,14 +10,16 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:id="@+id/linearLayoutActivity">
android:id="@+id/linearLayoutActivity"
>
<ImageView
android:layout_width="match_parent"
android:layout_height="180dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:id="@+id/imgViewActivity">
android:id="@+id/imgViewActivity"
android:background="@drawable/loading_icon">
</ImageView>
<TextView
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="4dp"
android:paddingLeft="18dp"
android:paddingRight="10dp"
android:paddingTop="2dp"
android:minHeight="80dp"
android:id="@+id/linearLayoutComment">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/imgViewProfile"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center_vertical"
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_weight="3"
android:orientation="vertical">
<TextView
android:id="@+id/txtViewSubActivityName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="2"
android:ellipsize="end"
android:textColor="?attr/themeColorInverse"
android:textSize="17sp"
android:layout_marginBottom="5dp"/>
<TextView
android:id="@+id/txtViewSubActivityShortDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textSize="15sp"
android:textColor="?attr/themeGray" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="date"
type="String" />
<variable
name="label"
type="String"/>
</data>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/spacing_extra_small"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{ label }" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="Date and Time"
app:srcCompat="@drawable/baseline_comment_24" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_extra_small"
android:orientation="horizontal"
>
<com.eventyay.organizer.ui.views.DatePicker
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/purple_500"
/>
<com.eventyay.organizer.ui.views.TimePicker
style="?attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_500"
/>
</LinearLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_extra_small"
>
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@{ label }"
android:inputType="datetime"
/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<CheckBox
android:id="@+id/starts_at_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Use Date and Time Picker"
android:textSize="@dimen/text_size_extra_small"
android:checked="true" />
</LinearLayout>
</layout>
......@@ -23,20 +23,20 @@
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_my_events"
android:icon="@drawable/ic_dashboard_black_48dp"
android:title="My Events"/>
<item
android:id="@+id/nav_add_my_events"
android:icon="@drawable/ic_dashboard_black_48dp"
android:title="Add Events"/>
<!-- <item-->
<!-- android:id="@+id/nav_sub_activities"-->
<!-- android:icon="@drawable/ic_dashboard_black_48dp"-->
<!-- android:title="Sub Activities"/>-->
<!-- <item-->
<!-- android:id="@+id/nav_my_events"-->
<!-- android:icon="@drawable/ic_dashboard_black_48dp"-->
<!-- android:title="My Events"/>-->
<!-- <item-->
<!-- android:id="@+id/nav_add_my_events"-->
<!-- android:icon="@drawable/ic_dashboard_black_48dp"-->
<!-- android:title="Add Events"/>-->
<item
android:id="@+id/nav_mess_menu"
......
......@@ -14,6 +14,30 @@
<color name="colorTagGreen">#AED581</color>
<color name="colorRed">#FF0000</color>
<color name="colorGreen">#00FF00</color>
<color name="blue_200">#90caf9</color>
<color name="light_blue_100">#B3E5FC</color>
<color name="light_blue_500">#03A9F4</color>
<color name="light_blue_a400">#00E5FF</color>
<color name="purple_100">#E1BEE7</color>
<color name="purple_500">#9C27B0</color>
<color name="green_a400">#76FF03</color>
<color name="green_500"> #4caf50</color>
<color name="light_green_500">#8BC34A</color>
<color name="red_100">#ffcdd2</color>
<color name="red_500">#f44336</color>
<color name="material_red">#ef5350</color>
<color name="grey_400">#BDBDBD</color>
<color name="grey_800">#424242</color>
<color name="grey_600">#757575</color>
<color name="colorprimary">#3F51B5</color>
<color name="colorprimaryDark">#303F9F</color>
<color name="coloraccent">#FF4081</color>
<color name="dark_blue">#3023AE</color>
<color name="purple">#c86dd7</color>
<color name="login_form_details">#ccffffff</color>
<color name="login_form_details_light">#1affffff</color>
<color name="login_form_details_medium">#66ffffff</color>
<!-- Map -->
<item name="transparent_black" type="color">#20000000</item>
<item name="list_item_gray_even" type="color">#ffe6e6e6</item>
......
......@@ -13,4 +13,31 @@
<!-- Widget -->
<dimen name="widget_margin">16dp</dimen>
<dimen name="spacing_zero">0dp</dimen>
<dimen name="spacing_tiniest">1dp</dimen>
<dimen name="spacing_tiny">2dp</dimen>
<dimen name="spacing_extra_small">4dp</dimen>
<dimen name="spacing_small">8dp</dimen>
<dimen name="spacing_medium">12dp</dimen>
<dimen name="spacing_normal">16dp</dimen>
<dimen name="spacing_big">24dp</dimen>
<dimen name="spacing_large">32dp</dimen>
<dimen name="spacing_larger">48dp</dimen>
<dimen name="spacing_extra_large">64dp</dimen>
<dimen name="spacing_200">200dp</dimen>
<dimen name="text_size_extra_smaller">10sp</dimen>
<dimen name="text_size_extra_small">12sp</dimen>
<dimen name="text_size_small">14sp</dimen>
<dimen name="text_size_normal">16sp</dimen>
<dimen name="text_size_medium">18sp</dimen>
<dimen name="text_size_large">20sp</dimen>
<dimen name="text_size_larger">32sp</dimen>
<dimen name="text_size_extra_large">40sp</dimen>
<dimen name="text_size_extra_larger">52sp</dimen>
</resources>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
......@@ -92,4 +92,17 @@
<style name="UserTabsTextAppearance" parent="TextAppearance.Design.Tab">
<item name="android:textSize">12sp</item>
</style>
<style name="ItemPadding">
<item name="android:paddingTop">@dimen/spacing_small</item>
<item name="android:paddingBottom">@dimen/spacing_small</item>
<item name="android:paddingLeft">@dimen/spacing_normal</item>
<item name="android:paddingRight">@dimen/spacing_normal</item>
<item name="android:paddingStart" tools:targetApi="jelly_bean_mr1">@dimen/spacing_normal</item>
<item name="android:paddingEnd" tools:targetApi="jelly_bean_mr1">@dimen/spacing_normal</item>\
</style>
</resources>
......@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.android.tools.build:gradle:3.5.2'
// classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.google.gms:google-services:4.3.2'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment