summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x.idea/gradle.xml2
-rwxr-xr-xorg.fox.ttcomics/build.gradle1
-rwxr-xr-xorg.fox.ttcomics/org.fox.ttcomics.iml1
-rwxr-xr-xorg.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java74
-rwxr-xr-xorg.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java8
-rwxr-xr-x[-rw-r--r--]org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml4
-rwxr-xr-xorg.fox.ttcomics/src/main/res/layout/activity_main.xml2
-rwxr-xr-x[-rw-r--r--]org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml86
-rwxr-xr-xorg.fox.ttcomics/src/main/res/values/style.xml2
9 files changed, 61 insertions, 119 deletions
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 48a7928..51e7748 100755
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleHome" value="C:\Users\Andrew\AppData\Local\Android\android-studio1\gradle\gradle-2.2.1" />
+ <option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 81d62c7..329aa7c 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -27,4 +27,5 @@ dependencies {
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.android.support:cardview-v7:21.0.3'
compile 'it.neokree:MaterialTabs:0.11'
+ compile files('libs/universal-image-loader-1.9.3.jar')
}
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index b330399..54d9171 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -87,6 +87,7 @@
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+ <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
</component>
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java
index 8afe882..919fa64 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java
@@ -31,6 +31,8 @@ import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
+import com.nostra13.universalimageloader.core.ImageLoader;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -135,7 +137,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
}
}
- ImageView overflow = (ImageView) v.findViewById(R.id.comic_overflow);
+ /* ImageView overflow = (ImageView) v.findViewById(R.id.comic_overflow);
if (overflow != null) {
if (size == SIZE_DIR) {
@@ -149,36 +151,16 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
}
});
}
- }
+ } */
File thumbnailFile = new File(m_activity.getCacheFileName(firstChild != null ? firstChild : filePath + "/" + fileBaseName));
ImageView thumbnail = (ImageView) v.findViewById(R.id.thumbnail);
- if (thumbnail != null) {
- /* View imageholder = v.findViewById(R.id.imageholder);
-
- int padding = dpToPx(2);
-
- if (imageholder != null) {
- if (size == SIZE_DIR) {
- imageholder.setBackgroundResource(R.drawable.comic_tile_folder);
- imageholder.setPadding(padding, padding, padding, padding);
- } else {
- imageholder.setBackgroundResource(R.drawable.comic_tile);
- imageholder.setPadding(padding, padding, padding, padding);
- }
- } */
-
- thumbnail.setTag("");
- thumbnail.setImageResource(R.drawable.ic_launcher);
-
- if (m_activity.isStorageAvailable() && thumbnailFile.exists()) {
- thumbnail.setTag(thumbnailFile.getAbsolutePath());
+ if (thumbnail != null && thumbnailFile != null) {
- CoverImageLoader imageLoader = new CoverImageLoader();
- imageLoader.execute(thumbnail);
- }
+ ImageLoader imageLoader = ImageLoader.getInstance();
+ imageLoader.displayImage("file://" + thumbnailFile.getAbsolutePath(), thumbnail);
}
return v;
@@ -191,46 +173,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
return px;
}
- class CoverImageLoader extends AsyncTask<ImageView, Void, Bitmap> {
- private ImageView m_thumbnail;
- private String m_tag;
-
- @Override
- protected Bitmap doInBackground(ImageView... params) {
- m_thumbnail = params[0];
-
- if (m_thumbnail != null) {
- m_tag = m_thumbnail.getTag().toString();
-
- File thumbnailFile = new File(m_tag);
-
- if (thumbnailFile.exists() && thumbnailFile.canRead()) {
-
- final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeFile(thumbnailFile.getAbsolutePath(), options);
-
- options.inSampleSize = CommonActivity.calculateInSampleSize(options, 256, 256);
- options.inJustDecodeBounds = false;
-
- Bitmap bmp = BitmapFactory.decodeFile(thumbnailFile.getAbsolutePath(), options);
-
- return bmp;
- }
- }
-
- return null;
- }
-
- @Override
- protected void onPostExecute(Bitmap bmp) {
- if (isAdded() && bmp != null && m_tag != null && m_tag.equals(m_thumbnail.getTag().toString())) {
- m_thumbnail.setImageBitmap(bmp);
- }
- }
-
- };
-
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -239,7 +181,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
if (savedInstanceState != null) {
m_mode = savedInstanceState.getInt("mode");
m_baseDirectory = savedInstanceState.getString("baseDir");
- //m_files = savedInstanceState.getStringArrayList("files");
}
m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.comics_swipe_container);
@@ -517,7 +458,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
out.putInt("mode", m_mode);
out.putString("baseDir", m_baseDirectory);
- //out.putStringArrayList("files", m_files);
}
}
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
index 9e99b5b..e41e27d 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
@@ -23,6 +23,9 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+
import java.io.File;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -52,6 +55,11 @@ public class CommonActivity extends ActionBarActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this)
+ .diskCacheSize(0)
+ .build();
+ ImageLoader.getInstance().init(config);
+
m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
initDatabase();
diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml
index ebbc43e..63a7abf 100644..100755
--- a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_main.xml
@@ -11,8 +11,8 @@
android:layout_width="match_parent"
android:layout_height="48dp"
app:textColor="#FFFFFF"
- app:primaryColor="?colorPrimary"
- app:accentColor="?colorAccent" />
+ app:primaryColor="#FF6F00"
+ app:accentColor="#F8CE00" />
<FrameLayout
android:id="@+id/comics_list"
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
index 9a57ecd..0fdd5f0 100755
--- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
@@ -12,7 +12,7 @@
android:layout_height="48dp"
app:textColor="#FFFFFF"
app:primaryColor="#FF6F00"
- app:accentColor="?colorAccent" />
+ app:accentColor="#F8CE00" />
<FrameLayout
android:id="@+id/comics_list"
diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
index 507f0b7..6600f89 100644..100755
--- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
+++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml
@@ -17,69 +17,61 @@
android:layout_gravity="center_horizontal"
android:gravity="center_vertical"
android:orientation="vertical"
- android:padding="4dp" >
+ android:padding="0dp" >
<FrameLayout
- android:id="@+id/imageholder"
android:layout_width="160dp"
- android:layout_height="160dp"
+ android:layout_height="200dp"
android:layout_gravity="center_horizontal"
android:layout_weight="0"
- android:padding="6dp" >
+ android:padding="0dp" >
<ImageView
android:id="@+id/thumbnail"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scaleType="centerInside"
- android:padding="4dp"
- android:src="@drawable/ic_launcher" />
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop"
+ android:src="@drawable/default_background" />
- <ImageView
- android:id="@+id/comic_overflow"
- android:layout_gravity="bottom|right"
- android:paddingBottom="4dp"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_weight="0"
- android:src="@drawable/ic_action_overflow" />
+ android:layout_gravity="bottom|center_horizontal"
+ android:gravity="center_horizontal|bottom"
+ android:background="@drawable/comic_grid_footer"
+ android:orientation="vertical" >
- </FrameLayout>
+ <TextView
+ android:id="@+id/file_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:ellipsize="middle"
+ android:singleLine="true"
+ android:text="Comic_1980.cbz"
+ android:textColor="@android:color/primary_text_dark"
+ android:textSize="11sp" />
- <LinearLayout
- android:id="@+id/linearLayout4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
+ <ProgressBar
+ android:id="@+id/file_progress_bar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="96dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1" />
- <TextView
- android:id="@+id/file_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:ellipsize="middle"
- android:singleLine="true"
- android:text="Comic_1980.cbz"
- android:textSize="11sp" />
+ <TextView
+ android:id="@+id/file_progress_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/primary_text_dark"
+ android:layout_weight="0"
+ android:gravity="right"
+ android:text="12 of 325"
+ android:textSize="8sp" />
+ </LinearLayout>
- <ProgressBar
- android:id="@+id/file_progress_bar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="96dp"
- android:layout_height="wrap_content"
- android:layout_weight="1" />
+ </FrameLayout>
- <TextView
- android:id="@+id/file_progress_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:gravity="right"
- android:text="12 of 325"
- android:textSize="8sp" />
- </LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView> \ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml
index 18359ec..b7730f7 100755
--- a/org.fox.ttcomics/src/main/res/values/style.xml
+++ b/org.fox.ttcomics/src/main/res/values/style.xml
@@ -3,7 +3,7 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">#FF0000</item>
<item name="colorPrimaryDark">#990000</item>
- <item name="colorAccent">#FFDB00</item>
+ <item name="colorAccent">#FF7500</item>
</style>
<style name="ViewLightTheme" parent="AppTheme">
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 08:09:51 +0000