Skip to content

Commit 54ed46a

Browse files
committed
Various bug fixes
1 parent 84a7af3 commit 54ed46a

5 files changed

Lines changed: 47 additions & 4 deletions

File tree

reddinator/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="au.com.wallaceit.reddinator"
4-
android:versionCode="35"
4+
android:versionCode="36"
55
android:versionName="3.04">
66

77
<uses-permission android:name="android.permission.INTERNET" />

reddinator/src/main/java/au/com/wallaceit/reddinator/Reddinator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,6 @@ public static boolean isImageUrl(String url) {
447447
}
448448

449449
public static boolean hasImageExtension(String url){
450-
return url.toLowerCase().matches("([^\\s]+(\\.(?i)(jpe?g|png|gif|bmp))$)");
450+
return url.toLowerCase().matches("([^\\s]+(\\.(?i)(jpe?g|png|gif?v|bmp))$)");
451451
}
452452
}

reddinator/src/main/java/au/com/wallaceit/reddinator/activity/ViewImageDialogActivity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818
package au.com.wallaceit.reddinator.activity;
1919

20+
import android.annotation.SuppressLint;
2021
import android.app.Activity;
2122
import android.content.Intent;
2223
import android.content.pm.PackageManager;
@@ -37,6 +38,7 @@ public class ViewImageDialogActivity extends Activity {
3738
WebView webView;
3839
String imageUrl;
3940

41+
@SuppressLint("SetJavaScriptEnabled")
4042
@Override
4143
protected void onCreate(Bundle savedInstanceState) {
4244
super.onCreate(savedInstanceState);
@@ -53,6 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
5355
webView.setBackgroundColor(Color.TRANSPARENT);
5456
webView.setWebViewClient(new ImageWebViewClient());
5557
webView.getSettings().setDomStorageEnabled(true);
58+
webView.getSettings().setJavaScriptEnabled(true);
5659
webView.getSettings().setLoadWithOverviewMode(true);
5760
webView.getSettings().setUseWideViewPort(true);
5861
webView.getSettings().setSupportZoom(true);
@@ -82,5 +85,9 @@ class ImageWebViewClient extends WebViewClient {
8285
public void onPageFinished(WebView webView, String url) {
8386
findViewById(R.id.loadingPanel).setVisibility(View.GONE);
8487
}
88+
89+
public boolean shouldOverrideUrlLoading(WebView view, String url) {
90+
return true;
91+
}
8592
}
8693
}

reddinator/src/main/res/layout/applistrowbigthumb.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@
2525
android:scaleType="centerCrop"
2626
android:visibility="gone" />
2727

28+
<ImageView
29+
android:id="@+id/thumbnail_expand"
30+
android:layout_width="18dp"
31+
android:layout_height="18dp"
32+
android:maxHeight="18dp"
33+
android:maxWidth="18dp"
34+
android:minHeight="18dp"
35+
android:minWidth="18dp"
36+
android:layout_alignParentLeft="true"
37+
android:layout_alignParentStart="true"
38+
android:layout_alignParentTop="true"
39+
android:layout_marginLeft="8dp"
40+
android:layout_marginStart="8dp"
41+
android:layout_marginTop="68dp"
42+
android:contentDescription="@string/img"
43+
android:scaleType="centerCrop"
44+
android:visibility="gone" />
45+
2846
<TextView
2947
android:id="@+id/listheading"
3048
android:layout_width="fill_parent"
@@ -53,6 +71,7 @@
5371
android:layout_height="wrap_content"
5472
android:layout_alignParentRight="true"
5573
android:layout_alignParentEnd="true"
74+
android:layout_alignParentTop="true"
5675
android:orientation="vertical"
5776
android:layout_marginRight="6dp"
5877
android:layout_marginEnd="6dp">

reddinator/src/main/res/layout/listrowbigthumb.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
android:layout_height="wrap_content"
1717
android:layout_alignParentRight="true"
1818
android:layout_alignParentEnd="true"
19+
android:layout_alignParentTop="true"
1920
android:orientation="vertical"
2021
android:gravity="center_horizontal"
2122
android:layout_marginRight="8dp"
@@ -62,8 +63,6 @@
6263
android:layout_height="80dp"
6364
android:maxHeight="80dp"
6465
android:maxWidth="80dp"
65-
android:layout_toLeftOf="@+id/widget_votecontainer"
66-
android:layout_toStartOf="@+id/widget_votecontainer"
6766
android:layout_centerHorizontal="true"
6867
android:layout_marginLeft="6dp"
6968
android:layout_marginRight="6dp"
@@ -72,6 +71,24 @@
7271
android:scaleType="centerCrop"
7372
android:visibility="gone" />
7473

74+
<ImageView
75+
android:id="@+id/thumbnail_expand"
76+
android:layout_width="18dp"
77+
android:layout_height="18dp"
78+
android:maxHeight="18dp"
79+
android:maxWidth="18dp"
80+
android:minHeight="18dp"
81+
android:minWidth="18dp"
82+
android:layout_alignParentLeft="true"
83+
android:layout_alignParentStart="true"
84+
android:layout_alignParentTop="true"
85+
android:layout_marginLeft="8dp"
86+
android:layout_marginStart="8dp"
87+
android:layout_marginTop="68dp"
88+
android:contentDescription="@string/img"
89+
android:scaleType="centerCrop"
90+
android:visibility="gone" />
91+
7592
<TextView
7693
android:id="@+id/listheading"
7794
android:layout_width="fill_parent"

0 commit comments

Comments
 (0)