From 3b0eb15646cc9ac60a7661cf25d5a1a528bae404 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Tue, 27 Aug 2019 16:46:46 +0800 Subject: This app now has an icon (finally)git statusgit statusgit status Add a credits page in settings. Use another error view and no comment placeholder. --- app/src/main/ic_launcher-web.png | Bin 0 -> 27730 bytes .../java/Settings/AboutPreferenceFragment.java | 19 +++ .../java/Settings/CreditsPreferenceFragment.java | 110 +++++++++++++ .../main/java/Settings/MainPreferenceFragment.java | 1 + .../CommentAndPostRecyclerViewAdapter.java | 1 - .../infinityforreddit/CommentsListingFragment.java | 2 +- .../FollowedUsersListingFragment.java | 2 +- .../infinityforreddit/NotificationUtils.java | 4 +- .../infinityforreddit/PostFragment.java | 2 +- .../infinityforreddit/PostRecyclerViewAdapter.java | 1 - .../infinityforreddit/SharedPreferencesUtils.java | 8 + .../SubredditListingFragment.java | 2 +- .../SubscribedSubredditsListingFragment.java | 2 +- .../infinityforreddit/UserListingFragment.java | 2 +- .../infinityforreddit/ViewMessageActivity.java | 2 +- .../infinityforreddit/ViewPostDetailActivity.java | 2 +- .../res/drawable-v24/ic_launcher_background.xml | 74 +++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 34 ----- app/src/main/res/drawable/error_image.xml | 54 +++++++ app/src/main/res/drawable/gold.png | Bin 18745 -> 0 bytes app/src/main/res/drawable/gold.xml | 9 ++ .../main/res/drawable/ic_launcher_background.xml | 170 --------------------- .../main/res/drawable/ic_launcher_foreground.xml | 60 ++++++++ .../res/drawable/load_post_error_indicator.png | Bin 60464 -> 0 bytes .../main/res/drawable/no_comment_placeholder.png | Bin 60561 -> 0 bytes app/src/main/res/layout/item_acknowledgement.xml | 5 +- .../item_load_comments_failed_placeholder.xml | 2 +- .../res/layout/item_no_comment_placeholder.xml | 2 +- app/src/main/res/layout/item_post.xml | 1 + app/src/main/res/layout/item_post_detail.xml | 1 + app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 4809 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 4809 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 2993 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 2993 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 6830 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 6830 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 10847 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 10847 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 15190 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 15190 bytes app/src/main/res/values/strings.xml | 17 +++ app/src/main/res/xml/about_preferences.xml | 13 ++ app/src/main/res/xml/credits_preferences.xml | 44 ++++++ app/src/main/res/xml/main_preferences.xml | 6 +- 46 files changed, 433 insertions(+), 227 deletions(-) create mode 100644 app/src/main/ic_launcher-web.png create mode 100644 app/src/main/java/Settings/AboutPreferenceFragment.java create mode 100644 app/src/main/java/Settings/CreditsPreferenceFragment.java create mode 100644 app/src/main/res/drawable-v24/ic_launcher_background.xml delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/error_image.xml delete mode 100644 app/src/main/res/drawable/gold.png create mode 100644 app/src/main/res/drawable/gold.xml delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/drawable/load_post_error_indicator.png delete mode 100644 app/src/main/res/drawable/no_comment_placeholder.png create mode 100644 app/src/main/res/xml/about_preferences.xml create mode 100644 app/src/main/res/xml/credits_preferences.xml (limited to 'app/src') diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 00000000..172f7d9a Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/Settings/AboutPreferenceFragment.java b/app/src/main/java/Settings/AboutPreferenceFragment.java new file mode 100644 index 00000000..40873284 --- /dev/null +++ b/app/src/main/java/Settings/AboutPreferenceFragment.java @@ -0,0 +1,19 @@ +package Settings; + + +import android.os.Bundle; + +import androidx.preference.PreferenceFragmentCompat; + +import ml.docilealligator.infinityforreddit.R; + +/** + * A simple {@link PreferenceFragmentCompat} subclass. + */ +public class AboutPreferenceFragment extends PreferenceFragmentCompat { + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + setPreferencesFromResource(R.xml.about_preferences, rootKey); + } +} diff --git a/app/src/main/java/Settings/CreditsPreferenceFragment.java b/app/src/main/java/Settings/CreditsPreferenceFragment.java new file mode 100644 index 00000000..6bc3b467 --- /dev/null +++ b/app/src/main/java/Settings/CreditsPreferenceFragment.java @@ -0,0 +1,110 @@ +package Settings; + + +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; + +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; + +import ml.docilealligator.infinityforreddit.LinkResolverActivity; +import ml.docilealligator.infinityforreddit.R; +import ml.docilealligator.infinityforreddit.SharedPreferencesUtils; + +/** + * A simple {@link PreferenceFragmentCompat} subclass. + */ +public class CreditsPreferenceFragment extends PreferenceFragmentCompat { + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + setPreferencesFromResource(R.xml.credits_preferences, rootKey); + + Preference iconForegroundPreference = findPreference(SharedPreferencesUtils.ICON_FOREGROUND_KEY); + Preference iconBackgroundPreference = findPreference(SharedPreferencesUtils.ICON_BACKGROUND_KEY); + Preference errorImagePreference = findPreference(SharedPreferencesUtils.ERROR_IMAGE_KEY); + Preference placeholderPreference = findPreference(SharedPreferencesUtils.SUBREDDIT_AND_USER_PLACEHOLDER_KEY); + Preference gildedIconPreference = findPreference(SharedPreferencesUtils.GILDED_ICON_KEY); + Preference crosspostIconPreference = findPreference(SharedPreferencesUtils.CROSSPOST_ICON_KEY); + Preference thumbtackIconPreference = findPreference(SharedPreferencesUtils.THUMBTACK_ICON_KEY); + Preference materialIconsPreference = findPreference(SharedPreferencesUtils.MATERIAL_ICONS_KEY); + + Activity activity = getActivity(); + + if(activity != null) { + if(iconForegroundPreference != null) { + iconForegroundPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.freepik.com/free-photos-vectors/technology")); + startActivity(intent); + return true; + }); + } + + if(iconBackgroundPreference != null) { + iconBackgroundPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.freepik.com/free-photos-vectors/background")); + startActivity(intent); + return true; + }); + } + + if(errorImagePreference != null) { + errorImagePreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.freepik.com/free-photos-vectors/technology")); + startActivity(intent); + return true; + }); + } + + if(placeholderPreference != null) { + placeholderPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.freepik.com/free-photos-vectors/technology")); + startActivity(intent); + return true; + }); + } + + if(gildedIconPreference != null) { + gildedIconPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://br.flaticon.com/icone-gratis/medalha_1007239")); + startActivity(intent); + return true; + }); + } + + if(crosspostIconPreference != null) { + crosspostIconPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.flaticon.com/free-icon/crossed-arrows_2291")); + startActivity(intent); + return true; + }); + } + + if(thumbtackIconPreference != null) { + thumbtackIconPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.flaticon.com/free-icon/tack-save-button_61845#term=thumbtack&page=1&position=3")); + startActivity(intent); + return true; + }); + } + + if(materialIconsPreference != null) { + materialIconsPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://material.io/resources/icons/")); + startActivity(intent); + return true; + }); + } + } + } +} diff --git a/app/src/main/java/Settings/MainPreferenceFragment.java b/app/src/main/java/Settings/MainPreferenceFragment.java index c8234fb5..fbe97347 100644 --- a/app/src/main/java/Settings/MainPreferenceFragment.java +++ b/app/src/main/java/Settings/MainPreferenceFragment.java @@ -24,6 +24,7 @@ import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES; * A simple {@link PreferenceFragmentCompat} subclass. */ public class MainPreferenceFragment extends PreferenceFragmentCompat { + @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { setPreferencesFromResource(R.xml.main_preferences, rootKey); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java index 095abbaa..8952cf12 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java @@ -325,7 +325,6 @@ class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter 0) { ((PostDetailViewHolder) holder).mGildedImageView.setVisibility(View.VISIBLE); - mGlide.load(R.drawable.gold).into(((PostDetailViewHolder) holder).mGildedImageView); ((PostDetailViewHolder) holder).mGildedNumberTextView.setVisibility(View.VISIBLE); String gildedNumber = mActivity.getResources().getString(R.string.gilded_count, mPost.getGilded()); ((PostDetailViewHolder) holder).mGildedNumberTextView.setText(gildedNumber); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingFragment.java index 272ed624..3721d839 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingFragment.java @@ -156,7 +156,7 @@ public class CommentsListingFragment extends Fragment implements FragmentCommuni if(activity != null && isAdded()) { mFetchCommentInfoLinearLayout.setVisibility(View.VISIBLE); mFetchCommentInfoTextView.setText(stringResId); - mGlide.load(R.drawable.load_post_error_indicator).into(mFetchCommentInfoImageView); + mGlide.load(R.drawable.error_image).into(mFetchCommentInfoImageView); } } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java index 9a371b8a..83a30838 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java @@ -86,7 +86,7 @@ public class FollowedUsersListingFragment extends Fragment { if (subscribedUserData == null || subscribedUserData.size() == 0) { mRecyclerView.setVisibility(View.GONE); mLinearLayout.setVisibility(View.VISIBLE); - mGlide.load(R.drawable.load_post_error_indicator).into(mImageView); + mGlide.load(R.drawable.error_image).into(mImageView); } else { mLinearLayout.setVisibility(View.GONE); mRecyclerView.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java index 2fc832d5..7d09608f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/NotificationUtils.java @@ -29,7 +29,7 @@ class NotificationUtils { return new NotificationCompat.Builder(context.getApplicationContext(), channelId) .setContentTitle(title) .setContentText(content) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.ic_launcher_foreground) .setStyle(new NotificationCompat.BigTextStyle() .setSummaryText(summary) .bigText(content)) @@ -49,7 +49,7 @@ class NotificationUtils { .setContentTitle(title) //set content text to support devices running API level < 24 .setContentText(content) - .setSmallIcon(R.mipmap.ic_launcher) + .setSmallIcon(R.drawable.ic_launcher_foreground) .setGroup(group) .setGroupSummary(true) .setAutoCancel(true); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java index 7420893e..db10f91f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostFragment.java @@ -416,7 +416,7 @@ public class PostFragment extends Fragment implements FragmentCommunicator { if(activity != null && isAdded()) { mFetchPostInfoLinearLayout.setVisibility(View.VISIBLE); mFetchPostInfoTextView.setText(stringResId); - mGlide.load(R.drawable.load_post_error_indicator).into(mFetchPostInfoImageView); + mGlide.load(R.drawable.error_image).into(mFetchPostInfoImageView); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java index 5a1ec974..fc2b4024 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java @@ -299,7 +299,6 @@ class PostRecyclerViewAdapter extends PagedListAdapter 0) { ((DataViewHolder) holder).gildedImageView.setVisibility(View.VISIBLE); - mGlide.load(R.drawable.gold).into(((DataViewHolder) holder).gildedImageView); ((DataViewHolder) holder).gildedNumberTextView.setVisibility(View.VISIBLE); String gildedNumber = mContext.getResources().getString(R.string.gilded_count, gilded); ((DataViewHolder) holder).gildedNumberTextView.setText(gildedNumber); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SharedPreferencesUtils.java index 061c94df..d54e83cb 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SharedPreferencesUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SharedPreferencesUtils.java @@ -10,4 +10,12 @@ public class SharedPreferencesUtils { public static final String LAZY_MODE_INTERVAL_KEY = "lazy_mode_interval"; public static final String NSFW_KEY = "nsfw"; public static final String THEME_KEY = "theme"; + public static final String ICON_FOREGROUND_KEY = "icon_foreground"; + public static final String ICON_BACKGROUND_KEY = "icon_background"; + public static final String ERROR_IMAGE_KEY = "error_image"; + public static final String SUBREDDIT_AND_USER_PLACEHOLDER_KEY = "subreddit_and_user_profile_placeholder"; + public static final String GILDED_ICON_KEY = "gilded_icon"; + public static final String CROSSPOST_ICON_KEY = "crosspost_icon"; + public static final String THUMBTACK_ICON_KEY = "thumbtack_icon"; + public static final String MATERIAL_ICONS_KEY = "material_icons"; } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java index dce606c6..61bd8fdd 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingFragment.java @@ -162,7 +162,7 @@ public class SubredditListingFragment extends Fragment implements FragmentCommun if(getActivity() != null && isAdded()) { mFetchSubredditListingInfoLinearLayout.setVisibility(View.VISIBLE); mFetchSubredditListingInfoTextView.setText(stringResId); - Glide.with(this).load(R.drawable.load_post_error_indicator).into(mFetchSubredditListingInfoImageView); + Glide.with(this).load(R.drawable.error_image).into(mFetchSubredditListingInfoImageView); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java index 6006da7f..150cd509 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java @@ -100,7 +100,7 @@ public class SubscribedSubredditsListingFragment extends Fragment { if (subscribedSubredditData == null || subscribedSubredditData.size() == 0) { mRecyclerView.setVisibility(View.GONE); mLinearLayout.setVisibility(View.VISIBLE); - mGlide.load(R.drawable.load_post_error_indicator).into(mImageView); + mGlide.load(R.drawable.error_image).into(mImageView); } else { mLinearLayout.setVisibility(View.GONE); mRecyclerView.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java index 495890e5..c3471b9a 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingFragment.java @@ -141,7 +141,7 @@ public class UserListingFragment extends Fragment implements FragmentCommunicato if(getActivity() != null && isAdded()) { mFetchUserListingInfoLinearLayout.setVisibility(View.VISIBLE); mFetchUserListingInfoTextView.setText(stringResId); - Glide.with(this).load(R.drawable.load_post_error_indicator).into(mFetchUserListingInfoImageView); + Glide.with(this).load(R.drawable.error_image).into(mFetchUserListingInfoImageView); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewMessageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewMessageActivity.java index 629440f1..5d052cbd 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewMessageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewMessageActivity.java @@ -258,7 +258,7 @@ public class ViewMessageActivity extends AppCompatActivity { mProgressBar.setVisibility(View.GONE); mFetchMessageInfoLinearLayout.setVisibility(View.VISIBLE); mFetchMessageInfoTextView.setText(stringResId); - mGlide.load(R.drawable.load_post_error_indicator).into(mFetchMessageInfoImageView); + mGlide.load(R.drawable.error_image).into(mFetchMessageInfoImageView); } @Override diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java index 8bdff436..bdff4479 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java @@ -655,7 +655,7 @@ public class ViewPostDetailActivity extends AppCompatActivity implements FlairBo mFetchPostInfoLinearLayout.setVisibility(View.VISIBLE); mFetchPostInfoLinearLayout.setOnClickListener(view -> fetchPostAndCommentsById(subredditId)); mFetchPostInfoTextView.setText(R.string.load_posts_error); - mGlide.load(R.drawable.load_post_error_indicator).into(mFetchPostInfoImageView); + mGlide.load(R.drawable.error_image).into(mFetchPostInfoImageView); } private void showMessage(int resId) { diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml new file mode 100644 index 00000000..8863072a --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21db..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/error_image.xml b/app/src/main/res/drawable/error_image.xml new file mode 100644 index 00000000..88817417 --- /dev/null +++ b/app/src/main/res/drawable/error_image.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/gold.png b/app/src/main/res/drawable/gold.png deleted file mode 100644 index df04fbe8..00000000 Binary files a/app/src/main/res/drawable/gold.png and /dev/null differ diff --git a/app/src/main/res/drawable/gold.xml b/app/src/main/res/drawable/gold.xml new file mode 100644 index 00000000..333984f4 --- /dev/null +++ b/app/src/main/res/drawable/gold.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc53..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..52aa137b --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/load_post_error_indicator.png b/app/src/main/res/drawable/load_post_error_indicator.png deleted file mode 100644 index a067fb1e..00000000 Binary files a/app/src/main/res/drawable/load_post_error_indicator.png and /dev/null differ diff --git a/app/src/main/res/drawable/no_comment_placeholder.png b/app/src/main/res/drawable/no_comment_placeholder.png deleted file mode 100644 index 62a3668f..00000000 Binary files a/app/src/main/res/drawable/no_comment_placeholder.png and /dev/null differ diff --git a/app/src/main/res/layout/item_acknowledgement.xml b/app/src/main/res/layout/item_acknowledgement.xml index 543c6829..6ad6deb8 100644 --- a/app/src/main/res/layout/item_acknowledgement.xml +++ b/app/src/main/res/layout/item_acknowledgement.xml @@ -2,7 +2,10 @@ diff --git a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml index 9d8f9f7d..094d58bc 100644 --- a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml +++ b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml @@ -9,7 +9,7 @@ android:layout_width="150dp" android:layout_height="150dp" android:layout_gravity="center_horizontal" - android:src="@drawable/load_post_error_indicator" /> + android:src="@drawable/error_image" /> + android:src="@drawable/error_image" /> - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe..bbd3e021 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f59082..58c5dfcf 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1b523998..58c5dfcf 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd6..2f72c89d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 115a4c76..2f72c89d 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd80..63b45e6d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 459ca609..63b45e6d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe0..1d205893 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e19b410..1d205893 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebdd..0b2aad42 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4c19a13c..0b2aad42 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 762a5bf6..ecd92af2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -261,7 +261,24 @@ Device default Lazy Mode Interval Enable NSFW + About Acknowledgement + Credits + Icon Foreground + Technology vector created by freepik - www.freepik.com + Icon Background + Background vector created by freepik - www.freepik.com + Error Image + Technology vector created by freepik - www.freepik.com + Subreddit and User Placeholder + Technology vector created by freepik - www.freepik.com + Gilded Icon + Icon made by Freepik from www.flaticon.com + Crosspost Icon + Icon made by Freepik from www.flaticon.com + Thumbtack Icon + Icon made by Freepik from www.flaticon.com + Material Icons Cannot get the link diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml new file mode 100644 index 00000000..a16237e4 --- /dev/null +++ b/app/src/main/res/xml/about_preferences.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/credits_preferences.xml b/app/src/main/res/xml/credits_preferences.xml new file mode 100644 index 00000000..d5a5f580 --- /dev/null +++ b/app/src/main/res/xml/credits_preferences.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml index 7d482fae..bdf0f2a6 100644 --- a/app/src/main/res/xml/main_preferences.xml +++ b/app/src/main/res/xml/main_preferences.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -31,8 +30,7 @@ app:title="@string/settings_enable_nsfw_title"/> + app:title="@string/settings_about_master_title" + app:fragment="Settings.AboutPreferenceFragment" /> \ No newline at end of file -- cgit v1.2.3