diff --git a/app/src/main/java/com/mapps/seproject/CameraFragment.java b/app/src/main/java/com/mapps/seproject/CameraFragment.java index 8c8f181075a9238de2c69615b3fc6f486a61f744..7444e512e6bb156754cdf69a237e623d7ac6bef3 100644 --- a/app/src/main/java/com/mapps/seproject/CameraFragment.java +++ b/app/src/main/java/com/mapps/seproject/CameraFragment.java @@ -269,8 +269,10 @@ public class CameraFragment extends Fragment { if(flag == 0) { - databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.ids)).child("image").setValue(downloadUrl); - databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.ids)).child("timeStamp").setValue(timeStamp); + databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.individualIds)).child("image").setValue(downloadUrl); + databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.individualIds)).child("timeStamp").setValue(timeStamp); + databaseReference.child("feed").child(String.valueOf(MainActivity.ids)).child("image").setValue(downloadUrl); + databaseReference.child("feed").child(String.valueOf(MainActivity.ids)).child("timeStamp").setValue(timeStamp); flag = 1; } @@ -347,8 +349,10 @@ public class CameraFragment extends Fragment { if(flag == 0) { - databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.ids)).child("image").setValue(downloadUrl); - databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.ids)).child("timeStamp").setValue(timeStamp); + databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.individualIds)).child("image").setValue(downloadUrl); + databaseReference.child(UID).child("feed").child(String.valueOf(MainActivity.individualIds)).child("timeStamp").setValue(timeStamp); + databaseReference.child("feed").child(String.valueOf(MainActivity.ids)).child("image").setValue(downloadUrl); + databaseReference.child("feed").child(String.valueOf(MainActivity.ids)).child("timeStamp").setValue(timeStamp); flag = 1; } } diff --git a/app/src/main/java/com/mapps/seproject/MainActivity.java b/app/src/main/java/com/mapps/seproject/MainActivity.java index 86381823b570a0c2b3b21f8ec696bdaaf06b14f3..796175086f7d8fc167704560d80d147e682d2747 100644 --- a/app/src/main/java/com/mapps/seproject/MainActivity.java +++ b/app/src/main/java/com/mapps/seproject/MainActivity.java @@ -35,10 +35,13 @@ public class MainActivity extends AppCompatActivity { FragmentTransaction fragmentTransaction; FirebaseAuth firebaseAuth; + static int individualIds; + int flag = 0; FirebaseDatabase database = FirebaseDatabase.getInstance(); DatabaseReference databaseReference; + EditText getname; String userId; String UserEmail = null; @@ -151,20 +154,23 @@ public class MainActivity extends AppCompatActivity { - // UserName = getname.getText().toString(); + // UserName = getname.getText().toString(); if(flags == 0) { ids = (int) dataSnapshot.child("feed").getChildrenCount(); Long tsLong = System.currentTimeMillis()/1000; UID = firebaseUser.getUid(); + + individualIds = (int) dataSnapshot.child("feed").child(UID).child("feed").getChildrenCount(); final String TimeStamp = tsLong.toString(); - Feed feed = new Feed(ids,UserName,image,status,profilePic,TimeStamp,URL); - databaseReference.child(UID).child("feed").child(String.valueOf(ids)).setValue(feed); + Feed feed = new Feed(ids,RegisterActivity.name.getText().toString(),image,status,profilePic,TimeStamp,URL); + databaseReference.child(UID).child("feed").child(String.valueOf(individualIds)).setValue(feed); + databaseReference.child("feed").child(String.valueOf(ids)).setValue(feed); flags = 1; } diff --git a/app/src/main/res/layout/activity_municipal.xml b/app/src/main/res/layout/activity_municipal.xml index b4c94c116b081c6989d4d93de117c0458b67ba90..a0d314940280939964f7a15bf7126ec055aa6f35 100644 --- a/app/src/main/res/layout/activity_municipal.xml +++ b/app/src/main/res/layout/activity_municipal.xml @@ -7,7 +7,7 @@ <ListView android:id="@+id/list" android:layout_width="fill_parent" - android:layout_height="wrap_content" + android:layout_height="fill_parent" android:divider="@null" /> </LinearLayout> \ No newline at end of file