aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java8
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java2
-rw-r--r--app/src/main/res/layout/fragment_subreddit_listing.xml2
-rw-r--r--app/src/main/res/layout/fragment_user_listing.xml2
4 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java
index f52441b8..b332f90a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java
@@ -43,7 +43,7 @@ public class ParseUserData {
this.parseUserDataListener = parseUserDataListener;
parseFailed = false;
} catch (JSONException e) {
- Log.i("userdata json error", e.getMessage());
+ Log.i("userdata json error", "error: " + e.getMessage());
parseUserDataListener.onParseUserDataFailed();
}
}
@@ -54,7 +54,7 @@ public class ParseUserData {
userData = parseUserDataBase(jsonResponse);
} catch (JSONException e) {
parseFailed = true;
- Log.i("parse user data error", e.getMessage());
+ Log.i("parse user data error", "error: " + e.getMessage());
}
return null;
}
@@ -86,7 +86,7 @@ public class ParseUserData {
parseFailed = false;
userDataArrayList = new ArrayList<>();
} catch (JSONException e) {
- Log.i("userdata json error", e.getMessage());
+ Log.i("userdata json error", "error: " + e.getMessage());
parseFailed = true;
}
}
@@ -103,7 +103,7 @@ public class ParseUserData {
}
} catch (JSONException e) {
parseFailed = true;
- Log.i("parse user data error", e.getMessage());
+ Log.i("parse user data error", "error: " + e.getMessage());
}
return null;
}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java
index 8d55746f..bcad2452 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java
@@ -78,7 +78,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData>
this.params = params;
this.callback = callback;
- if(params.key.equals("null")) {
+ if(params.key.equals("null") || params.key.equals("")) {
return;
}
diff --git a/app/src/main/res/layout/fragment_subreddit_listing.xml b/app/src/main/res/layout/fragment_subreddit_listing.xml
index acc31dab..26c1c8fa 100644
--- a/app/src/main/res/layout/fragment_subreddit_listing.xml
+++ b/app/src/main/res/layout/fragment_subreddit_listing.xml
@@ -13,9 +13,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:background="@color/backgroundColor"
app:mlpb_progress_stoke_width="3dp"
app:mlpb_progress_color="@color/colorAccent"
+ app:mlpb_background_color="@color/circularProgressBarBackground"
android:layout_gravity="center_horizontal"/>
<androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_user_listing.xml b/app/src/main/res/layout/fragment_user_listing.xml
index bdd39dab..c44298ad 100644
--- a/app/src/main/res/layout/fragment_user_listing.xml
+++ b/app/src/main/res/layout/fragment_user_listing.xml
@@ -13,9 +13,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:background="@color/backgroundColor"
app:mlpb_progress_stoke_width="3dp"
app:mlpb_progress_color="@color/colorAccent"
+ app:mlpb_background_color="@color/circularProgressBarBackground"
android:layout_gravity="center_horizontal"/>
<androidx.recyclerview.widget.RecyclerView