v0.1 [merged-all except database]

karakasis · Apr 23, 2018 · 7be5b37 · 7be5b37
1 parent f550c9f
commit 7be5b37
Show file tree

Hide file tree

Showing 18 changed files with 594 additions and 120 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.NoActionBar">
         <activity
-          android:name=".MainMenu">
+          android:name=".main_menu.MainMenu">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,6 +28,7 @@
       tools:replace="screenOrientation" />
 
     <activity android:name=".BookInfoActivity"/>
+    <activity android:name=".gallery.GalleryBackend"/>
 
     </application>
 

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/BookInfoActivity.java b/app/src/main/java/com/example/xrhstos/bookapp/BookInfoActivity.java
@@ -75,8 +75,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     //Intent intent = getIntent();
     Bundle data = getIntent().getExtras();
-    int position = data.getInt("bookObjectPos");
-    currentBook = Bookshelf.getInstance().getSingleBook(position);
+    if(data.containsKey("gallery")){
+      currentBook = (Book) data.getParcelable("gallery");
+    }else{
+      int position = data.getInt("bookObjectPos");
+      currentBook = Bookshelf.getInstance().getSingleBook(position);
+    }
+
 
     String googleID = currentBook.getGoogleID();
     String id = currentBook.getId();

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/Bookshelf.java b/app/src/main/java/com/example/xrhstos/bookapp/Bookshelf.java
@@ -1,8 +1,7 @@
 package com.example.xrhstos.bookapp;
 
-import java.io.Serializable;
+import com.example.xrhstos.bookapp.main_menu.MainMenu;
 import java.util.ArrayList;
-import java.util.HashMap;
 
 /**
  * Created by philip on 12/4/2018.

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/Collection.java b/app/src/main/java/com/example/xrhstos/bookapp/Collection.java
@@ -63,9 +63,10 @@ public Book removeBook(){
 
   //returns the list of the book objects
   public ArrayList<Book> getBooks(){
-    ArrayList<Book> retur = new ArrayList<>();
-    retur.addAll(bookMap.values());
-    return new ArrayList<>(retur);
+    books = new ArrayList<>();
+    books.addAll(bookMap.values());
+    return new ArrayList<>(books);//mporei na exei error itan i retur
+
   }
 
   //returns the book in the asked position -- not working probably

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/DatabaseActivity.java b/app/src/main/java/com/example/xrhstos/bookapp/DatabaseActivity.java
@@ -45,12 +45,6 @@ public void onRatingChanged(RatingBar ratingBar, float rating, boolean fromUser)
         myDb = new DatabaseHelper(this);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu){
-        getMenuInflater().inflate(R.menu.menu, menu);
-        return true;
-    }
-
     /**
      *  This method adds a row to the database
      *  If row already exists catches exception and shows "ALREADY ADDED"

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/MyApp.java b/app/src/main/java/com/example/xrhstos/bookapp/MyApp.java
@@ -2,6 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
+import com.example.xrhstos.bookapp.gallery.GalleryBackend;
+import com.example.xrhstos.bookapp.main_menu.MainMenu;
 
 /**
  * Created by Xrhstos on 4/19/2018.
@@ -10,6 +12,7 @@
 public class MyApp extends Application {
   private static MyApp instance;
   public MainMenu mainMenu;
+  public GalleryBackend galleryBackend;
 
   public static MyApp getInstance() {
     return instance;

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/VolleyNetworking.java b/app/src/main/java/com/example/xrhstos/bookapp/VolleyNetworking.java
@@ -6,7 +6,6 @@
 import android.content.ContextWrapper;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.view.MenuItem;
 import android.widget.ImageView.ScaleType;
 import com.android.volley.AuthFailureError;
 import com.android.volley.NetworkError;
@@ -22,6 +21,7 @@
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.StringRequest;
 import com.android.volley.toolbox.Volley;
+import com.example.xrhstos.bookapp.main_menu.MainMenu;
 import com.example.xrhstos.bookapp.parsers.JsonIDParser;
 import com.example.xrhstos.bookapp.parsers.JsonParser;
 import com.example.xrhstos.bookapp.parsers.XmlParser;
@@ -128,7 +128,6 @@ public void onErrorResponse(VolleyError volleyError) {
     });
   }
 
-  //good reads request by id in VolleyNetworkingBookInfo class
 
   public StringRequest goodReadsRequestByISBN(final String queryISBNString) {
 
@@ -258,7 +257,6 @@ public void onErrorResponse(VolleyError volleyError) {
 
   }
 
-  //google request by id in VolleyNetworkingBookInfo class
 
   public JsonObjectRequest googleRequestByISBN(final String queryISBNString) {
 

diff --git a/app/src/main/java/com/example/xrhstos/bookapp/VolleyNetworkingBookInfo.java b/app/src/main/java/com/example/xrhstos/bookapp/VolleyNetworkingBookInfo.java