diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bceb50d..2ceede0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,14 +31,16 @@ - - - + + - - - + + + \ No newline at end of file diff --git a/app/src/main/java/com/android/example/neighbours/CampaignList.java b/app/src/main/java/com/android/example/neighbours/CampaignList.java new file mode 100644 index 0000000..dcee992 --- /dev/null +++ b/app/src/main/java/com/android/example/neighbours/CampaignList.java @@ -0,0 +1,29 @@ +package com.android.example.neighbours; + +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +public class CampaignList extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_campaign_list); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + }); + } + +} diff --git a/app/src/main/java/com/android/example/neighbours/CampaignListAdapter.java b/app/src/main/java/com/android/example/neighbours/CampaignListAdapter.java new file mode 100644 index 0000000..c2f7cca --- /dev/null +++ b/app/src/main/java/com/android/example/neighbours/CampaignListAdapter.java @@ -0,0 +1,77 @@ +package com.android.example.neighbours; + +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.ProgressBar; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.List; + +import static com.android.example.neighbours.R.id.view; + +/** + * Created by Harshit Bansal on 2/5/2017. + */ + +public class CampaignListAdapter extends RecyclerView.Adapter { + private List campaigns = new ArrayList(); + + public CampaignListAdapter(List campaigns){ + this.campaigns = campaigns; + } + + + public CampaignListAdapter(){ + this.campaigns = campaigns; + } + + public void setList(List campaigns){ + this.campaigns = campaigns; + } + + @Override + public MoviesViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View itemView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.campaign_card, parent, false); + itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + // Add on click listener here + } + }); + return new CampaignListAdapter.MoviesViewHolder(itemView); + } + + @Override + public void onBindViewHolder(MoviesViewHolder holder, int position) { + Campaign campaign = campaigns.get(position); + holder.title.setText(campaign.getTitle()); + holder.description.setText(campaign.getDescription()); + holder.relTime.setText(campaign.getTime()); + holder.totalFunds.setText(campaign.getTotalFunds()); + } + + @Override + public int getItemCount() { + return campaigns.size(); + } + + public class MoviesViewHolder extends RecyclerView.ViewHolder { + + public TextView title, relTime, description, totalFunds; + ProgressBar campaignProgress; + + public ImageView image; + public MoviesViewHolder(View view) { + super(view); + title = (TextView) view.findViewById(R.id.campaign_tile_title); + relTime = (TextView) view.findViewById(R.id.campaign_tile_rel_time); + description = (TextView) view.findViewById(R.id.campaign_tile_description); + totalFunds = (TextView) view.findViewById(R.id.campaign_tile_total_fund); + } + } +} diff --git a/app/src/main/java/com/android/example/neighbours/CreateEvent.java b/app/src/main/java/com/android/example/neighbours/CreateEvent.java index 944f445..9f7776a 100644 --- a/app/src/main/java/com/android/example/neighbours/CreateEvent.java +++ b/app/src/main/java/com/android/example/neighbours/CreateEvent.java @@ -12,6 +12,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; +import android.widget.Button; import android.widget.DatePicker; import android.widget.EditText; import android.widget.ImageView; @@ -30,6 +31,8 @@ public class CreateEvent extends AppCompatActivity implements View.OnClickListen EditText date,time; ImageView selectTime,selectDate; LinearLayout attachPhoto; + Button postEvent; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -45,6 +48,22 @@ protected void onCreate(Bundle savedInstanceState) { time=(EditText) findViewById(R.id.create_event_time_display); selectTime=(ImageView)findViewById(R.id.create_event_select_time); selectDate=(ImageView)findViewById(R.id.create_event_select_date); + postEvent=(Button)findViewById(R.id.create_event_post); + postEvent.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Uploader uploader = new Uploader(getApplicationContext()); + Events eventToAdd = new Events(eventDescription.toString(), "a1", "sample_image", "sample_community", "sample_organizer",date.toString()+" "+time.toString() ,eventName.toString(),"100k"); + /* + final DatabaseReference ref = database.getReference("commuities/sample_community/events/" + campaignCount); + Events eventToAdd = new Events("this is a description", "a1", "sample_image", "sample_community", "sample_organizer", "12:00", "sample_title","100k"); + ref.setValue(eventToAdd); + campaignCount++; + */ + uploader.createAndPushEvent(eventToAdd); + + } + }); selectDate.setOnClickListener(this); selectTime.setOnClickListener(this); diff --git a/app/src/main/java/com/android/example/neighbours/MainActivity.java b/app/src/main/java/com/android/example/neighbours/MainActivity.java index 056c588..219128a 100644 --- a/app/src/main/java/com/android/example/neighbours/MainActivity.java +++ b/app/src/main/java/com/android/example/neighbours/MainActivity.java @@ -31,8 +31,9 @@ public class MainActivity extends AppCompatActivity { Boolean bool=false; - EditText password; - Button createNewAccount,login; + EditText username,password; + Button loginButton; + Button createNewAccount; @Override protected void onCreate(Bundle savedInstanceState) { @@ -40,8 +41,20 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); ImageView hide=(ImageView) findViewById(R.id.hide_show); + username=(EditText)findViewById(R.id.username); password=(EditText)findViewById(R.id.password); + loginButton=(Button)findViewById(R.id.btn_login); + loginButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (username.toString() == "codefundo" && password.toString() == "password") { + Intent i=new Intent(MainActivity.this,HomeActivity.class); + startActivity(i); + + } + } + }); findViewById(R.id.username).setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/android/example/neighbours/create_complaint.java b/app/src/main/java/com/android/example/neighbours/create_complaint.java index f893fa9..55d70c0 100644 --- a/app/src/main/java/com/android/example/neighbours/create_complaint.java +++ b/app/src/main/java/com/android/example/neighbours/create_complaint.java @@ -4,10 +4,13 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; +import android.widget.EditText; import android.widget.RadioButton; public class create_complaint extends AppCompatActivity { + EditText complaintName,complaintDescription; + Button postComplaint; @Override protected void onCreate(Bundle savedInstanceState) @@ -15,6 +18,26 @@ protected void onCreate(Bundle savedInstanceState) super.onCreate(savedInstanceState); setContentView(R.layout.activity_create_complaint); + complaintName=(EditText)findViewById(R.id.complaint_name); + complaintDescription=(EditText)findViewById(R.id.message_complaint); + postComplaint=(Button)findViewById(R.id.send); + + postComplaint.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Uploader uploader = new Uploader(getApplicationContext()); + Events eventToAdd = new Events(complaintDescription.toString(), "a1", "sample_image", "sample_community", "sample_organizer", "12:00",complaintName.toString(),"100k"); + /* + final DatabaseReference ref = database.getReference("commuities/sample_community/events/" + campaignCount); + Events eventToAdd = new Events("this is a description", "a1", "sample_image", "sample_community", "sample_organizer", "12:00", "sample_title","100k"); + ref.setValue(eventToAdd); + campaignCount++; + */ + uploader.createAndPushEvent(eventToAdd); + + } + }); + final RadioButton left=(RadioButton) findViewById(R.id.radio_pub); final RadioButton right=(RadioButton) findViewById(R.id.radio_private); diff --git a/app/src/main/res/layout/activity_campaign_list.xml b/app/src/main/res/layout/activity_campaign_list.xml new file mode 100644 index 0000000..b77645e --- /dev/null +++ b/app/src/main/res/layout/activity_campaign_list.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/campaign_tile.xml b/app/src/main/res/layout/campaign_tile.xml index 90438d0..6cb32da 100644 --- a/app/src/main/res/layout/campaign_tile.xml +++ b/app/src/main/res/layout/campaign_tile.xml @@ -1,42 +1,43 @@ - - - - - diff --git a/app/src/main/res/layout/content_campaign_list.xml b/app/src/main/res/layout/content_campaign_list.xml new file mode 100644 index 0000000..3a85583 --- /dev/null +++ b/app/src/main/res/layout/content_campaign_list.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/layout/event_tile.xml b/app/src/main/res/layout/event_tile.xml index 79d146a..4ccb56e 100644 --- a/app/src/main/res/layout/event_tile.xml +++ b/app/src/main/res/layout/event_tile.xml @@ -7,36 +7,36 @@ android:gravity="center" android:layout_height="170dp"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ff27fd..1142cd8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,5 +18,6 @@ yourLuisAppID yourLuisSubscriptionID + CampaignList