diff --git a/.gradle/4.4/fileHashes/fileHashes.bin b/.gradle/4.4/fileHashes/fileHashes.bin index 491a146..6426611 100644 Binary files a/.gradle/4.4/fileHashes/fileHashes.bin and b/.gradle/4.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.4/fileHashes/fileHashes.lock b/.gradle/4.4/fileHashes/fileHashes.lock index 9026c6a..d05ba24 100644 Binary files a/.gradle/4.4/fileHashes/fileHashes.lock and b/.gradle/4.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.4/taskHistory/taskHistory.bin b/.gradle/4.4/taskHistory/taskHistory.bin index 5b1277c..ffe740d 100644 Binary files a/.gradle/4.4/taskHistory/taskHistory.bin and b/.gradle/4.4/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.4/taskHistory/taskHistory.lock b/.gradle/4.4/taskHistory/taskHistory.lock index 566750b..4379abb 100644 Binary files a/.gradle/4.4/taskHistory/taskHistory.lock and b/.gradle/4.4/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 230e9af..2647af1 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 70365b4..dc6be35 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 1ee5f94..40f3d65 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { applicationId "com.project.wanderlust" - minSdkVersion 18 + minSdkVersion 21 targetSdkVersion 27 versionCode 1 versionName "1.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 135acb5..d1cf929 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/java/com/project/wanderlust/Contacts.java b/app/src/main/java/com/project/wanderlust/Contacts.java index 2251e38..45307b9 100644 --- a/app/src/main/java/com/project/wanderlust/Contacts.java +++ b/app/src/main/java/com/project/wanderlust/Contacts.java @@ -25,7 +25,7 @@ public class Contacts extends AppCompatActivity implements RecyclerView.OnItemTo GestureDetector gestureDetector; Context c; RecyclerView rv; - final ArrayList arrayList = new ArrayList<>(); + final static ArrayList arrayList = new ArrayList<>(); ContactAdapter adapter; @Override diff --git a/app/src/main/java/com/project/wanderlust/UserDetailsActivity.java b/app/src/main/java/com/project/wanderlust/UserDetailsActivity.java new file mode 100644 index 0000000..768df2e --- /dev/null +++ b/app/src/main/java/com/project/wanderlust/UserDetailsActivity.java @@ -0,0 +1,55 @@ +package com.project.wanderlust; + +import android.content.ContextWrapper; +import android.content.Intent; +import android.graphics.Bitmap; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.widget.ImageView; +import android.widget.TextView; + +import com.google.firebase.auth.FirebaseAuth; +import com.google.firebase.database.DataSnapshot; +import com.google.firebase.database.DatabaseError; +import com.google.firebase.database.FirebaseDatabase; +import com.google.firebase.database.ValueEventListener; + +import java.io.File; + +public class UserDetailsActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_user_details); + + FirebaseDatabase.getInstance().getReference("users").child(FirebaseAuth.getInstance().getCurrentUser().getPhoneNumber()) + .addListenerForSingleValueEvent(new ValueEventListener() { + @Override + public void onDataChange(DataSnapshot dataSnapshot) { + String name = dataSnapshot.child("name").getValue(String.class); + ((TextView) findViewById(R.id.name)).setText(name); + } + @Override public void onCancelled(DatabaseError databaseError) { } + }); + + FirebaseDatabase.getInstance().getReference("Journeys").child(FirebaseAuth.getInstance().getCurrentUser().getPhoneNumber()) + .addListenerForSingleValueEvent(new ValueEventListener() { + @Override + public void onDataChange(DataSnapshot dataSnapshot) { + long checkIns = dataSnapshot.getChildrenCount(); + ((TextView) findViewById(R.id.check)).setText(Long.toString(checkIns)); + } + + @Override public void onCancelled(DatabaseError databaseError) { } + }); + + ContextWrapper wrapper = new ContextWrapper(getApplicationContext()); + File file = wrapper.getDir("profilePictures",MODE_PRIVATE); + file = new File(file, FirebaseAuth.getInstance().getCurrentUser().getPhoneNumber() + ".jpg"); + final Bitmap bitmap = SharedFunctions.decodeBitmapFromFile(file, 100, 100); + ((ImageView) findViewById(R.id.photo)).setImageBitmap(bitmap); + + ((TextView) findViewById(R.id.friends)).setText(Integer.toString(Contacts.arrayList.size())); + } +} diff --git a/app/src/main/res/drawable/checkins.jpg b/app/src/main/res/drawable/checkins.jpg new file mode 100644 index 0000000..c3cda2c Binary files /dev/null and b/app/src/main/res/drawable/checkins.jpg differ diff --git a/app/src/main/res/drawable/friends.jpg b/app/src/main/res/drawable/friends.jpg new file mode 100644 index 0000000..a98ec72 Binary files /dev/null and b/app/src/main/res/drawable/friends.jpg differ diff --git a/app/src/main/res/drawable/locations.jpg b/app/src/main/res/drawable/locations.jpg new file mode 100644 index 0000000..53e03ea Binary files /dev/null and b/app/src/main/res/drawable/locations.jpg differ diff --git a/app/src/main/res/drawable/test.jpg b/app/src/main/res/drawable/test.jpg new file mode 100644 index 0000000..007cb0a Binary files /dev/null and b/app/src/main/res/drawable/test.jpg differ diff --git a/app/src/main/res/layout/activity_user_details.xml b/app/src/main/res/layout/activity_user_details.xml new file mode 100644 index 0000000..3327ab3 --- /dev/null +++ b/app/src/main/res/layout/activity_user_details.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 364bf66..df2be23 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -213,6 +213,7 @@ Camera Cancel Carrier SMS charges may apply + Check-ins Create Want to describe? @@ -220,13 +221,18 @@ Enter 6-digit code + Friends + Gallery + Lahore, Pakistan + MOBILE next phone number + Places Profile info Please provide your name and profile photo diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 81a3f11..448492d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -15,4 +15,10 @@ @color/colorAccent + +