diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2c7e034..e9969a1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 824d6d6..cebfe61 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,8 +3,12 @@ + + - + + + @@ -16,4 +20,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d713139..f89edf3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,35 +47,50 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'com.google.firebase:firebase-auth:20.0.3' - implementation 'com.google.firebase:firebase-database:19.7.0' implementation 'androidx.navigation:navigation-fragment:2.3.3' implementation 'androidx.navigation:navigation-ui:2.3.3' implementation 'com.android.support:multidex:1.0.3' - - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - - implementation 'com.google.firebase:firebase-firestore:22.1.2' - implementation 'com.google.firebase:firebase-storage:19.2.2' implementation 'com.squareup.picasso:picasso:2.71828' - implementation "androidx.recyclerview:recyclerview:+" implementation 'com.android.support:design:+' implementation 'com.android.support:cardview-v7:+' - implementation 'com.firebaseui:firebase-ui-database:6.2.0' - implementation 'androidx.recyclerview:recyclerview-selection:+' implementation 'com.github.bumptech.glide:glide:4.12.0' implementation 'com.google.android.gms:play-services-maps:+' implementation 'com.google.android.gms:play-services-location:+' implementation 'com.sun.mail:android-mail:1.6.2' implementation 'com.sun.mail:android-activation:1.6.2' - - - annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' - testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + + + implementation platform('com.google.firebase:firebase-bom:28.4.0') + implementation 'com.google.firebase:firebase-storage' + implementation 'com.google.firebase:firebase-auth' + implementation 'com.google.firebase:firebase-database' + implementation 'com.google.firebase:firebase-firestore' + implementation 'com.firebaseui:firebase-ui-database:8.0.0' + // FirebaseUI for Cloud Firestore + implementation 'com.firebaseui:firebase-ui-firestore:8.0.0' + // FirebaseUI for Firebase Auth + implementation 'com.firebaseui:firebase-ui-auth:8.0.0' + // FirebaseUI for Cloud Storage + implementation 'com.firebaseui:firebase-ui-storage:8.0.0' + + implementation "com.google.firebase:firebase-database:" + + implementation "androidx.legacy:legacy-support-v4:" + implementation "androidx.recyclerview:recyclerview:" + + + + + + + + + + + } \ No newline at end of file diff --git a/app/src/main/java/com/example/booksharing21/BProfileActivity.java b/app/src/main/java/com/example/booksharing21/BProfileActivity.java index 702ae02..1206daf 100644 --- a/app/src/main/java/com/example/booksharing21/BProfileActivity.java +++ b/app/src/main/java/com/example/booksharing21/BProfileActivity.java @@ -161,7 +161,7 @@ public class BProfileActivity extends AppCompatActivity implements View.OnClickL Intent intent = new Intent(Intent.ACTION_SEND); intent.putExtra(Intent.EXTRA_EMAIL, uemail); - intent.putExtra(Intent.EXTRA_SUBJECT,pbookname.getText().toString()); + intent.putExtra(Intent.EXTRA_SUBJECT,ubookname.getText().toString()); intent.putExtra(Intent.EXTRA_TEXT,message); intent.setType("message/rfc822"); startActivity(Intent.createChooser(intent,"Choose Email Client")); diff --git a/app/src/main/java/com/example/booksharing21/HomeFragment.java b/app/src/main/java/com/example/booksharing21/HomeFragment.java index cc9157d..7973a7f 100644 --- a/app/src/main/java/com/example/booksharing21/HomeFragment.java +++ b/app/src/main/java/com/example/booksharing21/HomeFragment.java @@ -147,6 +147,8 @@ public class HomeFragment extends Fragment { LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity()); inforec.setLayoutManager(layoutManager); inforec.setHasFixedSize(true); + layoutManager.setReverseLayout(true); + layoutManager.setStackFromEnd(true); // Array list @@ -216,7 +218,27 @@ public class HomeFragment extends Fragment { + public void database(){ + DatabaseReference connectedRef = FirebaseDatabase.getInstance().getReference(".info/connected"); + connectedRef.addValueEventListener(new ValueEventListener() { + @Override + public void onDataChange(DataSnapshot snapshot) { + boolean connected = snapshot.getValue(Boolean.class); + if (connected) { + System.out.println("connected"); + } else { + System.out.println("not connected"); + } + } + @Override + public void onCancelled(DatabaseError error) { + System.err.println("Listener was cancelled"); + } + }); + + + } @@ -227,7 +249,7 @@ public class HomeFragment extends Fragment { public void onStart() { super.onStart(); - + database(); GetDataFromFirebase(); //onStart Called } diff --git a/app/src/main/java/com/example/booksharing21/LibraryFragment.java b/app/src/main/java/com/example/booksharing21/LibraryFragment.java index 0a14eed..45c4d1d 100644 --- a/app/src/main/java/com/example/booksharing21/LibraryFragment.java +++ b/app/src/main/java/com/example/booksharing21/LibraryFragment.java @@ -156,6 +156,8 @@ public class LibraryFragment extends Fragment { info.setPostid(dataSnapshot.child("postid").getValue().toString()); info.setUrl(dataSnapshot.child("url").getValue().toString()); info.setBookname(dataSnapshot.child("book name").getValue().toString()); + info.setIsbn(dataSnapshot.child("isbn").getValue().toString()); + info.setAuthor(dataSnapshot.child("author").getValue().toString()); infoList.add(info); diff --git a/app/src/main/res/layout/activity_bprofile.xml b/app/src/main/res/layout/activity_bprofile.xml index 45fd4fa..191aaae 100644 --- a/app/src/main/res/layout/activity_bprofile.xml +++ b/app/src/main/res/layout/activity_bprofile.xml @@ -147,7 +147,8 @@ android:layout_marginTop="20dp" android:background="#fff" android:ems="10" - android:hint="If you are interested in this book, write your message to send an email to the owner" + android:hint="If you are interested in this book, + write your message to send an email to the owner" android:inputType="text" android:maxLength="500" android:padding="8dp" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index e065b2d..dfae051 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -9,20 +9,32 @@ + - + app:queryHint="Search"> + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 331ebc8..688caaa 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -24,10 +24,10 @@ + + +