From e8d8a6d3834926b404790a8cf1f0027818b65bad Mon Sep 17 00:00:00 2001
From: kishoreraju2 <kishoreraju.1998@gmail.com>
Date: Mon, 24 Apr 2017 05:06:38 +0530
Subject: [PATCH] Woohoo Personal and Municipality feed Completed with Small UI
fix
---
.../java/com/mapps/seproject/CameraFragment.java | 12 ++++++++----
.../main/java/com/mapps/seproject/MainActivity.java | 12 +++++++++---
app/src/main/res/layout/activity_municipal.xml | 2 +-
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/mapps/seproject/CameraFragment.java b/app/src/main/java/com/mapps/seproject/CameraFragment.java
index 8c8f181..7444e51 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 8638182..7961750 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 b4c94c1..a0d3149 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
--
GitLab