Răsfoiți Sursa

Visual improvement in gallery.
Images are downloaded faster for the image viewer.

seavenois 10 ani în urmă
părinte
comite
5656dccc49

+ 2 - 0
app/src/main/java/com/ivalentin/margolariak/DownloadImage.java

@@ -4,6 +4,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
 import android.util.Log;
+import android.view.View;
 import android.widget.ImageView;
 
 import java.io.BufferedInputStream;
@@ -101,6 +102,7 @@ class DownloadImage extends AsyncTask<Void, Void, Void> {
         Log.d("File downloaded", path);
         Bitmap myBitmap = BitmapFactory.decodeFile(path);
         iv.setImageBitmap(myBitmap);
+        iv.setVisibility(View.VISIBLE);
     }
 
 }

+ 2 - 1
app/src/main/java/com/ivalentin/margolariak/PhotoLayout.java

@@ -7,6 +7,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -211,7 +212,7 @@ public class PhotoLayout extends Fragment {
 			File fpath;
 			fpath = new File(this.getActivity().getFilesDir().toString() + "/img/galeria/view/");
 			fpath.mkdirs();
-			new DownloadImage(GM.SERVER + "/img/galeria/view/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/view/" + image, imageView).execute();
+			new DownloadImage(GM.SERVER + "/img/galeria/view/" + image, this.getActivity().getFilesDir().toString() + "/img/galeria/view/" + image, imageView).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 		}
 
 		//Hide or show comments, as needed

+ 2 - 0
app/src/main/java/com/ivalentin/margolariak/Sync.java

@@ -181,6 +181,7 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 		//Open the database. f its locked, exit.
 		SQLiteDatabase db = myContextRef.openOrCreateDatabase(GM.DB_NAME, Activity.MODE_PRIVATE, null);
 		if (db.isReadOnly()){
+			Log.e("DB LOCK", "L");
 			return null;
 		}
 
@@ -329,6 +330,7 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 		try{
 
 			for(int i = 0; i < queryList.size(); i++){
+				publishProgress();
 				try {
 					db.execSQL(queryList.get(i));
 				}

+ 2 - 2
app/src/main/res/layout/fragment_layout_activity_future.xml

@@ -71,9 +71,9 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/iv_activity_future_1"
                     android:contentDescription="@string/app_cdesc"
-                    android:visibility="gone"
                     android:layout_gravity="center_horizontal"
-                    android:maxHeight="50dp" />
+                    android:maxHeight="50dp"
+                    android:visibility="gone"/>
 
                 <ImageView
                     android:layout_width="wrap_content"

+ 20 - 12
app/src/main/res/layout/fragment_layout_home.xml

@@ -365,13 +365,15 @@
 						android:gravity="center_vertical|center_horizontal">
 
 						<ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/iv_home_section_gallery_0"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:id="@+id/iv_home_section_gallery_0"
 							android:contentDescription="@string/app_cdesc"
 							android:layout_margin="7dp"
-                            android:padding="1dp"
-                            android:background="@color/album_border" />
+							android:padding="1dp"
+							android:background="@color/album_border"
+							android:adjustViewBounds="true"
+							/>
 					</LinearLayout>
 
 					<LinearLayout
@@ -382,13 +384,15 @@
 						android:gravity="center_vertical|center_horizontal">
 
 						<ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/iv_home_section_gallery_1"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:id="@+id/iv_home_section_gallery_1"
 							android:contentDescription="@string/app_cdesc"
 							android:layout_margin="7dp"
-                            android:background="@color/album_border"
-                            android:padding="1dp" />
+							android:background="@color/album_border"
+							android:padding="1dp"
+							android:adjustViewBounds="true"
+							/>
 					</LinearLayout>
 
 				</LinearLayout>
@@ -413,7 +417,9 @@
 							android:contentDescription="@string/app_cdesc"
 							android:layout_margin="7dp"
 							android:padding="1dp"
-							android:background="@color/album_border" />
+							android:background="@color/album_border"
+							android:adjustViewBounds="true"
+							/>
 					</LinearLayout>
 
 					<LinearLayout
@@ -430,7 +436,9 @@
 							android:contentDescription="@string/app_cdesc"
 							android:layout_margin="7dp"
 							android:background="@color/album_border"
-							android:padding="1dp" />
+							android:padding="1dp"
+							android:adjustViewBounds="true"
+							/>
 					</LinearLayout>
 
 				</LinearLayout>

+ 3 - 1
app/src/main/res/layout/fragment_layout_photo.xml

@@ -35,7 +35,9 @@
                 android:id="@+id/iv_photo"
                 android:contentDescription="@string/app_cdesc"
                 android:padding="2dp"
-                android:background="@color/album_border"/>
+                android:background="@color/album_border"
+                android:adjustViewBounds="true"
+                android:src="@drawable/photo_placeholder_preview"/>
 
             <TextView
                 android:layout_width="wrap_content"

+ 6 - 2
app/src/main/res/layout/row_album.xml

@@ -31,7 +31,9 @@
             android:contentDescription="@string/app_cdesc"
             android:layout_gravity="center_horizontal"
             android:padding="2dp"
-            android:background="@color/album_border" />
+            android:background="@color/album_border"
+            android:adjustViewBounds="true"
+            android:src="@drawable/photo_placeholder_miniature"/>
 
         <TextView
             android:layout_width="fill_parent"
@@ -91,7 +93,9 @@
             android:layout_gravity="center_horizontal"
             android:contentDescription="@string/app_cdesc"
             android:padding="2dp"
-            android:background="@color/album_border" />
+            android:background="@color/album_border"
+            android:adjustViewBounds="true"
+            android:src="@drawable/photo_placeholder_miniature"/>
 
         <TextView
             android:layout_width="fill_parent"

+ 13 - 9
app/src/main/res/layout/row_gallery.xml

@@ -25,10 +25,11 @@
             android:layout_alignParentBottom="false"
             android:layout_marginEnd="90dp"
             android:layout_marginBottom="90dp"
-            android:padding="3dp"
+            android:padding="1dp"
             android:layout_alignParentEnd="false"
             android:layout_alignParentStart="false"
-            android:maxHeight="120dp" />
+            android:maxHeight="180dp"
+            android:src="@drawable/photo_placeholder_thumb"/>
 
         <ImageView
             android:contentDescription="@string/app_cdesc"
@@ -44,9 +45,10 @@
             android:layout_marginBottom="60dp"
             android:layout_marginStart="30dp"
             android:layout_marginTop="30dp"
-            android:padding="3dp"
+            android:padding="1dp"
             android:layout_alignParentStart="false"
-            android:maxHeight="120dp" />
+            android:maxHeight="180dp"
+            android:src="@drawable/photo_placeholder_thumb"/>
 
         <ImageView
             android:contentDescription="@string/app_cdesc"
@@ -60,11 +62,12 @@
             android:layout_alignParentBottom="false"
             android:layout_marginStart="60dp"
             android:layout_marginTop="60dp"
-            android:padding="3dp"
+            android:padding="1dp"
             android:layout_alignParentStart="false"
-            android:maxHeight="120dp"
+            android:maxHeight="180dp"
             android:layout_marginEnd="30dp"
-            android:layout_marginBottom="30dp" />
+            android:layout_marginBottom="30dp"
+            android:src="@drawable/photo_placeholder_thumb"/>
 
         <ImageView
             android:contentDescription="@string/app_cdesc"
@@ -78,9 +81,10 @@
             android:layout_alignParentBottom="false"
             android:layout_marginStart="90dp"
             android:layout_marginTop="90dp"
-            android:padding="3dp"
+            android:padding="1dp"
             android:layout_alignParentStart="false"
-            android:maxHeight="120dp" />
+            android:maxHeight="180dp"
+            android:src="@drawable/photo_placeholder_thumb"/>
     </RelativeLayout>
 
     <TextView