diff options
Diffstat (limited to '')
46 files changed, 433 insertions, 227 deletions
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png Binary files differnew file mode 100644 index 00000000..172f7d9a --- /dev/null +++ b/app/src/main/ic_launcher-web.png 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<RecyclerVie if(mPost.getGilded() > 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<Post, RecyclerView.ViewHo if(gilded > 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 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt" + android:width="108dp" + android:height="108dp" + android:viewportWidth="300" + android:viewportHeight="300"> + <group> + <clip-path android:pathData="M0,0h300v300h-300z M 0,0"/> + <path + android:pathData="M0,300L300,300L300,0L0,0L0,300Z"> + <aapt:attr name="android:fillColor"> + <gradient + android:startY="288.37054" + android:startX="150.00029" + android:endY="40.054146" + android:endX="150.00027" + android:type="linear"> + <item android:offset="0" android:color="#FF13345F"/> + <item android:offset="0.1" android:color="#FF13345F"/> + <item android:offset="0.2" android:color="#FF12315A"/> + <item android:offset="0.3" android:color="#FF102E55"/> + <item android:offset="0.4" android:color="#FF0F2A50"/> + <item android:offset="0.5" android:color="#FF0D274B"/> + <item android:offset="0.6" android:color="#FF0C2446"/> + <item android:offset="0.7" android:color="#FF0B2141"/> + <item android:offset="0.8" android:color="#FF091E3C"/> + <item android:offset="0.9" android:color="#FF081B37"/> + <item android:offset="1" android:color="#FF071935"/> + </gradient> + </aapt:attr> + </path> + <path + android:pathData="M110.172,98.062C110.179,98.427 110.172,98.792 110.149,99.149C110.141,99.248 110.134,99.339 110.125,99.43C110.119,99.59 110.103,99.75 110.081,99.909C110.012,100.48 109.905,101.042 109.761,101.597C109.693,101.894 109.609,102.19 109.51,102.479C109.449,102.677 109.381,102.867 109.313,103.065C108.932,104.083 108.438,105.057 107.83,105.954C107.511,106.425 107.161,106.881 106.781,107.315C106.393,107.756 105.982,108.174 105.541,108.562C104.652,109.36 103.656,110.044 102.561,110.592L102.538,110.599C101.641,111.056 100.683,111.405 99.664,111.656C98.478,111.945 97.284,112.074 96.113,112.059L96.098,112.059C94.722,112.029 93.368,111.793 92.084,111.367C91.133,111.063 90.213,110.645 89.354,110.143C88.852,109.847 88.373,109.52 87.916,109.162C87.43,108.79 86.974,108.379 86.541,107.938C86.26,107.657 85.985,107.36 85.734,107.049C85.438,106.691 85.157,106.319 84.899,105.931C84.739,105.68 84.579,105.422 84.427,105.163C84.214,104.798 84.017,104.418 83.842,104.03C83.591,103.49 83.378,102.928 83.203,102.35C83.119,102.084 83.043,101.81 82.974,101.536C82.861,101.065 82.77,100.601 82.709,100.13C82.693,100.046 82.678,99.963 82.671,99.879L82.671,99.871C82.663,99.826 82.656,99.78 82.656,99.734C82.656,99.712 82.648,99.696 82.648,99.674C82.64,99.613 82.633,99.56 82.633,99.499C82.542,98.548 82.557,97.613 82.663,96.693C82.732,96.047 82.853,95.416 83.013,94.792C83.241,93.91 83.56,93.059 83.956,92.245C84.039,92.063 84.131,91.88 84.23,91.705C84.952,90.367 85.895,89.143 87.02,88.101C88.677,86.566 90.737,85.425 93.087,84.847C95.323,84.3 97.55,84.338 99.634,84.847C99.9,84.916 100.166,84.984 100.424,85.068C101.481,85.387 102.5,85.843 103.442,86.406C103.982,86.725 104.5,87.075 104.986,87.478C105.367,87.767 105.731,88.094 106.073,88.436C106.826,89.181 107.495,90.01 108.073,90.93C108.445,91.531 108.78,92.162 109.069,92.831C109.092,92.884 109.114,92.945 109.138,93.006C109.145,93.028 109.161,93.059 109.168,93.082C109.297,93.401 109.411,93.728 109.518,94.055C109.617,94.351 109.7,94.655 109.776,94.967C109.913,95.537 110.02,96.108 110.088,96.678C110.141,97.142 110.172,97.598 110.172,98.062Z" + android:fillColor="#06B1C3"/> + <path + android:pathData="M107.83,105.954C107.511,106.425 107.161,106.881 106.781,107.315C106.393,107.756 105.982,108.174 105.541,108.562C104.652,109.36 103.656,110.044 102.561,110.592L102.538,110.599L96.113,112.059L96.098,112.059C94.722,112.029 93.368,111.793 92.084,111.367C91.133,111.063 90.213,110.645 89.354,110.143L105.602,106.456L107.83,105.954Z" + android:fillColor="#3693C1"/> + <path + android:pathData="M110.172,98.062C110.179,98.427 110.172,98.792 110.149,99.149C110.141,99.248 110.134,99.339 110.125,99.43C110.119,99.59 110.103,99.75 110.081,99.909C110.012,100.48 109.905,101.042 109.761,101.597L105.443,102.578L85.734,107.049C85.438,106.691 85.157,106.319 84.899,105.931C84.739,105.68 84.579,105.422 84.427,105.163C84.214,104.798 84.017,104.418 83.842,104.03L105.032,99.225L110.172,98.062Z" + android:fillColor="#28A0B3"/> + <path + android:pathData="M109.518,94.055L104.18,95.264L82.709,100.13C82.693,100.046 82.678,99.963 82.671,99.879L82.671,99.871C82.664,99.826 82.655,99.78 82.655,99.734C82.655,99.712 82.648,99.696 82.648,99.674C82.64,99.613 82.633,99.56 82.633,99.499C82.542,98.548 82.556,97.613 82.664,96.693L103.162,92.048L108.074,90.93C108.446,91.531 108.78,92.162 109.069,92.831C109.092,92.884 109.115,92.945 109.137,93.006C109.145,93.028 109.16,93.059 109.168,93.082C109.297,93.401 109.411,93.728 109.518,94.055Z" + android:fillColor="#0C8389"/> + <path + android:pathData="M104.986,87.478L101.549,88.261L83.955,92.245C84.039,92.063 84.13,91.88 84.229,91.705C84.952,90.367 85.895,89.143 87.02,88.102L99.854,85.197L100.424,85.068C101.482,85.387 102.5,85.843 103.443,86.406C103.982,86.725 104.499,87.075 104.986,87.478Z" + android:fillColor="#0F6E84"/> + <path + android:pathData="M110.172,98.062C110.179,98.427 110.172,98.792 110.149,99.149C110.141,99.248 110.134,99.339 110.125,99.43C110.119,99.59 110.103,99.75 110.081,99.909C110.012,100.48 109.905,101.042 109.761,101.597C109.693,101.894 109.609,102.19 109.51,102.479C109.449,102.677 109.381,102.867 109.313,103.065C108.932,104.083 108.438,105.057 107.83,105.954C107.511,106.425 107.161,106.881 106.781,107.315C106.393,107.756 105.982,108.174 105.541,108.562C105.579,107.847 105.602,107.14 105.602,106.456C105.61,105.11 105.557,103.817 105.443,102.578C105.351,101.415 105.214,100.297 105.032,99.225C104.803,97.826 104.515,96.511 104.18,95.264C103.876,94.131 103.534,93.059 103.162,92.048C102.66,90.664 102.112,89.402 101.55,88.261C100.987,87.121 100.409,86.094 99.854,85.197C99.778,85.075 99.701,84.961 99.634,84.847C99.9,84.916 100.166,84.984 100.424,85.068C101.481,85.387 102.5,85.843 103.442,86.406C103.982,86.725 104.5,87.075 104.986,87.478C105.367,87.767 105.731,88.094 106.073,88.436C106.826,89.181 107.495,90.01 108.073,90.93C108.445,91.531 108.78,92.162 109.069,92.831C109.092,92.884 109.114,92.945 109.138,93.006C109.145,93.028 109.161,93.059 109.168,93.082C109.297,93.401 109.411,93.728 109.518,94.055C109.617,94.351 109.7,94.655 109.776,94.967C109.913,95.537 110.02,96.108 110.088,96.678C110.141,97.142 110.172,97.598 110.172,98.062Z" + android:strokeAlpha="0.199997" + android:fillColor="#000000" + android:fillAlpha="0.199997"/> + <path + android:pathData="M98.995,105.498C84.26,109.109 71.752,109.755 71.061,106.935C70.612,105.102 75.288,102.251 82.671,99.483C82.686,99.537 82.701,99.59 82.724,99.643C82.739,99.704 82.754,99.765 82.777,99.825C79.356,101.392 77.364,102.882 77.622,103.931C78.139,106.022 87.416,105.543 98.349,102.867C109.275,100.183 117.722,96.32 117.212,94.23C116.916,93.028 113.753,92.678 109.054,93.089C109.046,93.066 109.046,93.043 109.039,93.021C109.031,92.96 109.016,92.899 109.008,92.838C117.714,91.614 123.934,91.895 124.42,93.857C125.104,96.678 113.722,101.886 98.995,105.498Z" + android:fillColor="#F25A46"/> + <path + android:pathData="M98.31,103.384C85.454,106.539 74.596,107.322 74.057,105.14C73.737,103.833 77.173,101.764 82.724,99.643C82.74,99.704 82.754,99.765 82.777,99.826C79.355,101.392 77.363,102.882 77.622,103.931C78.14,106.022 87.416,105.543 98.349,102.867C109.275,100.183 117.721,96.321 117.212,94.23C116.916,93.028 113.753,92.679 109.054,93.089C109.046,93.066 109.046,93.044 109.038,93.021C115.684,92.139 120.284,92.321 120.627,93.72C121.159,95.902 111.167,100.236 98.31,103.384Z" + android:fillColor="#AA1307"/> + <path + android:pathData="M220.911,107.588L217.508,109.714L217.37,113.726L213.822,111.841L210.277,113.726L210.138,109.714L206.735,107.588L210.138,105.463L210.277,101.45L213.822,103.336L217.37,101.45L217.508,105.463L220.911,107.588Z" + android:fillColor="#FED573"/> + <path + android:pathData="M196.953,90.781L194.553,92.281L194.455,95.111L191.953,93.781L189.452,95.111L189.353,92.281L186.953,90.781L189.353,89.281L189.452,86.451L191.953,87.781L194.455,86.451L194.553,89.281L196.953,90.781Z" + android:fillColor="#FED573"/> + <path + android:pathData="M216.017,88.709C216.017,89.957 215.006,90.968 213.759,90.968C212.511,90.968 211.5,89.957 211.5,88.709C211.5,87.462 212.511,86.451 213.759,86.451C215.006,86.451 216.017,87.462 216.017,88.709Z" + android:fillColor="#FED573"/> + <path + android:pathData="M225,117.887C225,119.016 224.085,119.932 222.956,119.932C221.826,119.932 220.911,119.016 220.911,117.887C220.911,116.758 221.826,115.843 222.956,115.843C224.085,115.843 225,116.758 225,117.887Z" + android:fillColor="#FED573"/> + <path + android:pathData="M172.217,92.946C172.217,94.142 171.247,95.111 170.052,95.111C168.856,95.111 167.886,94.142 167.886,92.946C167.886,91.75 168.856,90.781 170.052,90.781C171.247,90.781 172.217,91.75 172.217,92.946Z" + android:fillColor="#FED573"/> + </group> +</vector> 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 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:aapt="http://schemas.android.com/aapt" - android:width="108dp" - android:height="108dp" - android:viewportHeight="108" - android:viewportWidth="108"> - <path - android:fillType="evenOdd" - android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" - android:strokeColor="#00000000" - android:strokeWidth="1"> - <aapt:attr name="android:fillColor"> - <gradient - android:endX="78.5885" - android:endY="90.9159" - android:startX="48.7653" - android:startY="61.0927" - android:type="linear"> - <item - android:color="#44000000" - android:offset="0.0" /> - <item - android:color="#00000000" - android:offset="1.0" /> - </gradient> - </aapt:attr> - </path> - <path - android:fillColor="#FFFFFF" - android:fillType="nonZero" - android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" - android:strokeColor="#00000000" - android:strokeWidth="1" /> -</vector> 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 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="169.4dp" + android:height="141.4dp" + android:viewportWidth="169.4" + android:viewportHeight="141.4"> + <path + android:pathData="M38.199,118.602L38.138,119.349C37.838,123.044 34.951,135.916 34.951,135.916L38.507,137.579C38.507,137.579 40.936,134.715 48.987,122.37L50.023,121.586L38.199,118.602Z" + android:fillColor="#009559"/> + <path + android:pathData="M75.846,122.66L77.807,141.366L82.5,141.313L84.925,122.66L75.846,122.66Z" + android:fillColor="#009559"/> + <path + android:pathData="M126.591,118.196L117.925,122.267L130.964,135.15L134.409,132.275L126.591,118.196Z" + android:fillColor="#009559"/> + <path + android:pathData="M169.36,89.86C169.36,110.142 131.447,126.584 84.68,126.584C37.913,126.584 0,110.142 0,89.86C0,69.578 37.913,53.137 84.68,53.137C131.447,53.137 169.36,69.578 169.36,89.86Z" + android:fillColor="#00B57C"/> + <path + android:pathData="M90.422,111.47C90.328,113.622 87.585,115.251 84.296,115.107C81.007,114.964 78.417,113.102 78.511,110.949C78.605,108.796 81.348,107.167 84.637,107.311C87.926,107.455 90.516,109.317 90.422,111.47Z" + android:fillColor="#645EB2"/> + <path + android:pathData="M128.993,107.476C128.912,109.33 126.083,110.712 122.675,110.563C119.265,110.414 116.568,108.79 116.649,106.936C116.73,105.082 119.559,103.7 122.968,103.85C126.377,103.998 129.074,105.622 128.993,107.476Z" + android:fillColor="#645EB2"/> + <path + android:pathData="M154.836,93.616C154.75,95.59 151.819,97.064 148.291,96.91C144.763,96.756 141.973,95.031 142.059,93.057C142.145,91.084 145.075,89.609 148.604,89.763C152.132,89.918 154.922,91.642 154.836,93.616Z" + android:fillColor="#645EB2"/> + <path + android:pathData="M43.44,105.996C43.526,104.022 46.456,102.548 49.984,102.702C53.513,102.856 56.303,104.581 56.217,106.555C56.13,108.528 53.2,110.003 49.672,109.849C46.144,109.694 43.354,107.97 43.44,105.996Z" + android:fillColor="#645EB2"/> + <path + android:pathData="M14.525,93.977C14.608,92.063 17.682,90.644 21.39,90.806C25.098,90.968 28.035,92.65 27.952,94.564C27.868,96.477 24.795,97.897 21.087,97.735C17.379,97.573 14.442,95.891 14.525,93.977Z" + android:fillColor="#645EB2"/> + <path + android:pathData="M84.062,97.111C66.262,97.111 45.617,93.636 23.471,83.362L23.138,83.208L23.108,82.844C23.094,82.672 21.762,65.428 28.579,46.557C33.593,32.679 43.946,15.63 65.301,5.251C82.613,-3.164 103.387,-1.522 118.349,10.589C118.876,11.016 119.403,11.458 119.927,11.916C135.893,25.86 144.782,49.219 146.349,81.347L146.367,81.715L146.054,81.911C145.69,82.137 121.009,97.111 84.062,97.111Z" + android:fillColor="#98F4ED"/> + <path + android:pathData="M128.431,64.821C124.241,54.604 116.516,40.949 102.949,34.717C104.034,31.924 106.031,27.559 107.143,25.166C107.239,25.177 107.334,25.191 107.433,25.189C108.544,25.169 109.428,24.251 109.407,23.14C109.386,22.029 108.469,21.146 107.358,21.166C106.247,21.187 105.363,22.105 105.384,23.216C105.394,23.774 105.632,24.274 106.006,24.632C104.895,27.017 102.916,31.342 101.8,34.206C96.796,32.114 91.026,31.027 84.38,31.449L83.964,17.33C84.737,17.049 85.292,16.315 85.292,15.445C85.292,14.334 84.391,13.433 83.281,13.433C82.169,13.433 81.268,14.334 81.268,15.445C81.268,16.356 81.878,17.117 82.709,17.364L83.127,31.558C82.643,31.602 82.165,31.636 81.673,31.696C75.498,32.445 70.169,33.859 65.526,35.742C64.048,31.651 61.872,27.584 60.631,25.398C60.948,25.035 61.141,24.562 61.131,24.043C61.11,22.932 60.193,22.048 59.082,22.069C57.971,22.09 57.087,23.007 57.108,24.118C57.129,25.229 58.046,26.113 59.157,26.092C59.292,26.09 59.423,26.072 59.549,26.045C60.775,28.212 62.924,32.241 64.359,36.217C36.951,48.109 35.332,77.364 35.765,88.447C53.262,94.817 69.601,97.111 84.062,97.111C106.644,97.111 124.631,91.519 135.297,87.117C134.255,82.183 132.172,73.941 128.431,64.821Z" + android:fillColor="#FFF0BB"/> + <path + android:pathData="M77.172,61.355C78.097,62.842 79.504,64.214 81.139,64.875C84.381,66.185 87.04,63.967 88.914,61.501C89.624,60.566 88.041,59.656 87.339,60.58C85.689,62.751 83.405,64.419 80.849,62.651C80.025,62.081 79.279,61.288 78.748,60.434C78.128,59.439 76.549,60.354 77.172,61.355Z" + android:fillColor="#032560"/> + <path + android:pathData="M71.48,50.672C71.48,51.821 70.548,52.753 69.399,52.753C68.251,52.753 67.319,51.821 67.319,50.672C67.319,49.523 68.251,48.591 69.399,48.591C70.548,48.591 71.48,49.523 71.48,50.672Z" + android:fillColor="#032560"/> + <path + android:pathData="M98.167,50.672C98.167,51.821 97.235,52.753 96.086,52.753C94.937,52.753 94.006,51.821 94.006,50.672C94.006,49.523 94.937,48.591 96.086,48.591C97.235,48.591 98.167,49.523 98.167,50.672Z" + android:fillColor="#032560"/> + <path + android:pathData="M70.092,59.487C70.092,61.525 68.216,63.177 65.902,63.177C63.588,63.177 61.712,61.525 61.712,59.487C61.712,57.449 63.588,55.798 65.902,55.798C68.216,55.798 70.092,57.449 70.092,59.487Z" + android:fillColor="#FFAB3D"/> + <path + android:pathData="M102.81,59.487C102.81,61.525 100.934,63.177 98.62,63.177C96.306,63.177 94.43,61.525 94.43,59.487C94.43,57.449 96.306,55.798 98.62,55.798C100.934,55.798 102.81,57.449 102.81,59.487Z" + android:fillColor="#FFAB3D"/> +</vector> diff --git a/app/src/main/res/drawable/gold.png b/app/src/main/res/drawable/gold.png Binary files differdeleted file mode 100644 index df04fbe8..00000000 --- a/app/src/main/res/drawable/gold.png +++ /dev/null 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 @@ +<vector android:height="24dp" android:viewportHeight="512" + android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF3636" android:pathData="M470.191,46.036L408.754,5.824c-16.42,-10.748 -38.501,-6.19 -49.334,10.141L248.83,175.589c-2.666,3.847 -2.86,8.89 -0.497,12.931l67.332,115.201c2.184,3.737 6.135,6.208 10.463,6.233c0.029,0 0.058,0 0.087,0c4.785,0 9.487,-2.287 12.388,-6.537L480.357,95.734l0.162,-0.242C491.306,79.01 486.673,56.824 470.191,46.036z"/> + <path android:fillColor="#FF712F" android:pathData="M338.563,286.469L152.591,16.703c-5.229,-7.892 -13.204,-13.301 -22.479,-15.238c-9.342,-1.95 -18.883,-0.147 -26.867,5.079L41.808,46.757C25.326,57.546 20.694,79.732 31.482,96.214l0.112,0.172l141.293,203.513c1.582,2.279 4.139,3.687 6.911,3.805l146.445,6.251c2.932,0 5.894,-0.859 8.49,-2.649C341.544,302.611 343.259,293.281 338.563,286.469z"/> + <path android:fillColor="#FFD561" android:pathData="M383.798,384.115c0,70.514 -57.37,127.885 -127.885,127.885s-127.885,-57.37 -127.885,-127.885c0,-70.524 57.37,-127.895 127.885,-127.895S383.798,313.59 383.798,384.115z"/> + <path android:fillColor="#FFB64C" android:pathData="M383.798,384.115c0,70.514 -57.37,127.885 -127.885,127.885V256.22C326.428,256.22 383.798,313.59 383.798,384.115z"/> + <path android:fillColor="#FFF2D4" android:pathData="M322.143,381.498l-20.435,19.916l4.824,28.116c1.139,6.612 -1.528,13.164 -6.952,17.099c-5.433,3.945 -12.485,4.455 -18.418,1.328l-25.249,-13.274l-25.249,13.284c-2.577,1.348 -5.373,2.028 -8.15,2.028c-3.616,0 -7.191,-1.139 -10.258,-3.366c-5.433,-3.935 -8.09,-10.487 -6.962,-17.099l4.824,-28.116l-20.425,-19.906c-4.804,-4.684 -6.502,-11.546 -4.425,-17.928c2.068,-6.372 7.471,-10.937 14.113,-11.896l28.226,-4.105L240.232,322c2.966,-6.013 8.979,-9.748 15.681,-9.748c3.346,0 6.532,0.939 9.239,2.617c2.717,1.688 4.954,4.125 6.442,7.131l12.625,25.579l28.226,4.105c6.642,0.959 12.045,5.523 14.113,11.896C328.635,369.952 326.937,376.824 322.143,381.498z"/> + <path android:fillColor="#F9D8B4" android:pathData="M322.143,381.498l-20.435,19.916l4.824,28.116c1.139,6.612 -1.528,13.164 -6.952,17.099c-5.433,3.945 -12.485,4.455 -18.418,1.328l-25.249,-13.274V312.252c3.346,0 6.532,0.939 9.239,2.617c2.717,1.688 4.954,4.125 6.442,7.131l12.625,25.579l28.226,4.105c6.642,0.959 12.045,5.523 14.113,11.896C328.635,369.952 326.937,376.824 322.143,381.498z"/> +</vector> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="108dp" - android:height="108dp" - android:viewportHeight="108" - android:viewportWidth="108"> - <path - android:fillColor="#26A69A" - android:pathData="M0,0h108v108h-108z" /> - <path - android:fillColor="#00000000" - android:pathData="M9,0L9,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,0L19,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M29,0L29,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M39,0L39,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M49,0L49,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M59,0L59,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M69,0L69,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M79,0L79,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M89,0L89,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M99,0L99,108" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,9L108,9" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,19L108,19" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,29L108,29" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,39L108,39" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,49L108,49" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,59L108,59" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,69L108,69" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,79L108,79" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,89L108,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M0,99L108,99" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,29L89,29" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,39L89,39" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,49L89,49" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,59L89,59" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,69L89,69" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M19,79L89,79" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M29,19L29,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M39,19L39,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M49,19L49,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M59,19L59,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M69,19L69,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> - <path - android:fillColor="#00000000" - android:pathData="M79,19L79,89" - android:strokeColor="#33FFFFFF" - android:strokeWidth="0.8" /> -</vector> 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 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="357.14285" + android:viewportHeight="357.14285"> + <group android:translateX="-71.42857" + android:translateY="-71.42857"> + <group> + <clip-path android:pathData="M0,0h500v500h-500z M 0,0"/> + <path + android:pathData="M219.748,296.993C219.408,300.87 214.329,303.591 208.405,303.071C202.48,302.552 197.953,298.988 198.293,295.111C198.633,291.234 203.712,288.513 209.637,289.033C215.561,289.553 220.089,293.117 219.748,296.993Z" + android:fillColor="#FFB026"/> + <path + android:pathData="M262.901,299.84C262.901,304.319 256.949,307.95 249.606,307.95C242.263,307.95 236.311,304.319 236.311,299.84C236.311,295.361 242.263,291.73 249.606,291.73C256.949,291.73 262.901,295.361 262.901,299.84Z" + android:fillColor="#FFB026"/> + <path + android:pathData="M301.779,294.703C302.331,297.737 298.143,302.337 292.075,303.44C286.007,304.543 280.355,301.732 279.803,298.698C279.252,295.664 283.724,292.31 289.793,291.206C295.861,290.103 301.227,291.668 301.779,294.703Z" + android:fillColor="#FFB026"/> + <path + android:pathData="M339.357,284.694C339.357,284.694 330.183,264.955 266.958,256.022L250.001,256.443L233.044,256.022C169.817,264.955 160.643,284.694 160.643,284.694C160.643,284.694 199.105,298.247 250.001,297.934C300.896,298.247 339.357,284.694 339.357,284.694Z" + android:fillColor="#5F63C0"/> + <path + android:pathData="M320.769,279.308C321.229,281.009 319.246,283.025 316.339,283.811C313.433,284.596 310.705,283.854 310.245,282.153C309.785,280.452 311.768,278.436 314.674,277.65C317.581,276.865 320.309,277.607 320.769,279.308Z" + android:fillColor="#FB4A4C"/> + <path + android:pathData="M290.377,285.122C290.548,286.876 288.257,288.534 285.261,288.826C282.265,289.117 279.697,287.932 279.526,286.178C279.356,284.424 281.647,282.766 284.643,282.474C287.639,282.183 290.206,283.368 290.377,285.122Z" + android:fillColor="#FB4A4C"/> + <path + android:pathData="M254.778,287.907C254.79,289.669 252.359,291.114 249.348,291.134C246.338,291.155 243.887,289.742 243.876,287.98C243.864,286.218 246.295,284.773 249.305,284.753C252.316,284.733 254.766,286.145 254.778,287.907Z" + android:fillColor="#FB4A4C"/> + <path + android:pathData="M220.107,285.78C219.788,287.513 217.128,288.475 214.168,287.928C211.208,287.382 209.067,285.534 209.386,283.801C209.707,282.068 212.366,281.107 215.326,281.653C218.287,282.199 220.427,284.047 220.107,285.78Z" + android:fillColor="#FB4A4C"/> + <path + android:pathData="M189.639,278.445C189.409,280.192 186.802,281.29 183.818,280.896C180.832,280.503 178.6,278.767 178.83,277.02C179.061,275.273 181.666,274.176 184.652,274.57C187.636,274.963 189.868,276.698 189.639,278.445Z" + android:fillColor="#FB4A4C"/> + <path + android:pathData="M248.534,281.258C232.183,281.258 213.218,278.066 192.874,268.628L192.568,268.487L192.541,268.152C192.527,267.994 191.304,252.154 197.566,234.818C202.173,222.07 211.682,206.407 231.3,196.873C247.204,189.143 266.287,190.652 280.032,201.776C280.516,202.169 281,202.575 281.481,202.995C296.148,215.804 304.313,237.264 305.753,266.777L305.769,267.116L305.482,267.295C305.148,267.503 282.475,281.258 248.534,281.258Z" + android:fillColor="#FFF0BB"/> + <path + android:pathData="M296.362,255.201C294.633,250.501 292.334,245.185 289.329,240.008C291.131,239.316 292.416,237.581 292.416,235.535C292.416,232.883 290.265,230.732 287.612,230.732C286.234,230.732 285,231.321 284.124,232.251C275.905,221.721 263.963,213.701 246.792,216.025C231.714,218.066 221.252,224.167 214.005,232.01C213.149,231.224 212.018,230.732 210.764,230.732C208.112,230.732 205.962,232.883 205.962,235.535C205.962,237.258 206.876,238.756 208.237,239.604C201.819,249.913 199.329,261.683 198.473,271.07C216.697,278.612 233.694,281.258 248.534,281.258C273.703,281.258 292.665,273.698 300.926,269.703C299.76,265.319 298.268,260.388 296.362,255.201Z" + android:fillColor="#00B57C"/> + <path + android:pathData="M244.02,252.745C244.946,254.232 246.352,255.604 247.987,256.265C251.23,257.575 253.889,255.357 255.762,252.891C256.473,251.956 254.889,251.046 254.187,251.97C252.538,254.141 250.253,255.809 247.698,254.041C246.874,253.471 246.127,252.678 245.596,251.824C244.977,250.829 243.398,251.744 244.02,252.745Z" + android:fillColor="#032560"/> + <path + android:pathData="M238.328,242.062C238.328,243.211 237.396,244.143 236.248,244.143C235.099,244.143 234.167,243.211 234.167,242.062C234.167,240.913 235.099,239.981 236.248,239.981C237.396,239.981 238.328,240.913 238.328,242.062Z" + android:fillColor="#032560"/> + <path + android:pathData="M265.015,242.062C265.015,243.211 264.083,244.143 262.934,244.143C261.786,244.143 260.854,243.211 260.854,242.062C260.854,240.913 261.786,239.981 262.934,239.981C264.083,239.981 265.015,240.913 265.015,242.062Z" + android:fillColor="#032560"/> + <path + android:pathData="M236.941,250.877C236.941,252.915 235.065,254.567 232.751,254.567C230.437,254.567 228.561,252.915 228.561,250.877C228.561,248.839 230.437,247.188 232.751,247.188C235.065,247.188 236.941,248.839 236.941,250.877Z" + android:fillColor="#FFAB3D"/> + <path + android:pathData="M269.658,250.877C269.658,252.915 267.782,254.567 265.468,254.567C263.153,254.567 261.278,252.915 261.278,250.877C261.278,248.839 263.153,247.188 265.468,247.188C267.782,247.188 269.658,248.839 269.658,250.877Z" + android:fillColor="#FFAB3D"/> + </group> + </group> +</vector> diff --git a/app/src/main/res/drawable/load_post_error_indicator.png b/app/src/main/res/drawable/load_post_error_indicator.png Binary files differdeleted file mode 100644 index a067fb1e..00000000 --- a/app/src/main/res/drawable/load_post_error_indicator.png +++ /dev/null diff --git a/app/src/main/res/drawable/no_comment_placeholder.png b/app/src/main/res/drawable/no_comment_placeholder.png Binary files differdeleted file mode 100644 index 62a3668f..00000000 --- a/app/src/main/res/drawable/no_comment_placeholder.png +++ /dev/null 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 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="16dp" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp" android:clickable="true" android:focusable="true" android:background="?attr/selectableItemBackground"> 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" /> <TextView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/item_no_comment_placeholder.xml b/app/src/main/res/layout/item_no_comment_placeholder.xml index a4d85501..402f797c 100644 --- a/app/src/main/res/layout/item_no_comment_placeholder.xml +++ b/app/src/main/res/layout/item_no_comment_placeholder.xml @@ -9,7 +9,7 @@ android:layout_width="150dp" android:layout_height="150dp" android:layout_gravity="center_horizontal" - android:src="@drawable/no_comment_placeholder" /> + android:src="@drawable/error_image" /> <TextView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 10a9fbdd..c4f8e944 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -101,6 +101,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginStart="16dp" + android:src="@drawable/gold" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/type_text_view_item_post" diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index 32a0f3b1..918165e1 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -100,6 +100,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_marginStart="16dp" + android:src="@drawable/gold" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/type_text_view_item_post_detail" diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe..bbd3e021 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> </adaptive-icon>
\ 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 @@ <?xml version="1.0" encoding="utf-8"?> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> </adaptive-icon>
\ 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 Binary files differindex a2f59082..58c5dfcf 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differindex 1b523998..58c5dfcf 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differindex ff10afd6..2f72c89d 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differindex 115a4c76..2f72c89d 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differindex dcd3cd80..63b45e6d 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differindex 459ca609..63b45e6d 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex 8ca12fe0..1d205893 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differindex 8e19b410..1d205893 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex b824ebdd..0b2aad42 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differindex 4c19a13c..0b2aad42 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png 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 @@ <string name="settings_theme_system_default_summary">Device default</string> <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string> <string name="settings_enable_nsfw_title">Enable NSFW</string> + <string name="settings_about_master_title">About</string> <string name="settings_acknowledgement_master_title">Acknowledgement</string> + <string name="settings_credits_master_title">Credits</string> + <string name="settings_credits_icon_foreground_title">Icon Foreground</string> + <string name="settings_credits_icon_foreground_summary">Technology vector created by freepik - www.freepik.com</string> + <string name="settings_credits_icon_background_title">Icon Background</string> + <string name="settings_credits_icon_background_summary">Background vector created by freepik - www.freepik.com</string> + <string name="settings_credits_error_image_title">Error Image</string> + <string name="settings_credits_error_image_summary">Technology vector created by freepik - www.freepik.com</string> + <string name="settings_credits_subreddit_and_user_placeholder_title">Subreddit and User Placeholder</string> + <string name="settings_credits_subreddit_and_user_placeholder_summary">Technology vector created by freepik - www.freepik.com</string> + <string name="settings_credits_gilded_icon_title">Gilded Icon</string> + <string name="settings_credits_gilded_icon_summary">Icon made by Freepik from www.flaticon.com</string> + <string name="settings_credits_crosspost_icon_title">Crosspost Icon</string> + <string name="settings_credits_crosspost_icon_summary">Icon made by Freepik from www.flaticon.com</string> + <string name="settings_credits_thumbtack_icon_title">Thumbtack Icon</string> + <string name="settings_credits_thumbtack_icon_summary">Icon made by Freepik from www.flaticon.com</string> + <string name="settings_credits_material_icons_title">Material Icons</string> <string name="no_link_available">Cannot get the link</string> </resources> 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <Preference + app:title="@string/settings_acknowledgement_master_title" + app:fragment="Settings.AcknowledgementFragment" /> + + <Preference + app:title="@string/settings_credits_master_title" + app:fragment="Settings.CreditsPreferenceFragment" /> + +</PreferenceScreen>
\ 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <Preference + android:key="icon_foreground" + app:title="@string/settings_credits_icon_foreground_title" + android:summary="@string/settings_credits_icon_foreground_summary" /> + + <Preference + android:key="icon_background" + app:title="@string/settings_credits_icon_background_title" + android:summary="@string/settings_credits_icon_background_summary" /> + + <Preference + android:key="error_image" + app:title="@string/settings_credits_error_image_title" + android:summary="@string/settings_credits_error_image_summary" /> + + <Preference + android:key="subreddit_and_user_placeholder" + app:title="@string/settings_credits_subreddit_and_user_placeholder_title" + android:summary="@string/settings_credits_subreddit_and_user_placeholder_summary" /> + + <Preference + android:key="gilded_icon" + app:title="@string/settings_credits_gilded_icon_title" + android:summary="@string/settings_credits_gilded_icon_summary" /> + + <Preference + android:key="crosspost_icon" + app:title="@string/settings_credits_crosspost_icon_title" + android:summary="@string/settings_credits_crosspost_icon_summary" /> + + <Preference + android:key="thumbtack_icon" + app:title="@string/settings_credits_thumbtack_icon_title" + android:summary="@string/settings_credits_thumbtack_icon_summary" /> + + <Preference + android:key="material_icons" + app:title="@string/settings_credits_material_icons_title"/> + +</PreferenceScreen>
\ 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"> <Preference - app:key="notification_master" app:icon="@drawable/ic_outline_notifications_24px" app:title="@string/settings_notification_master_title" app:fragment="Settings.NotificationPreferenceFragment" /> @@ -31,8 +30,7 @@ app:title="@string/settings_enable_nsfw_title"/> <Preference - app:key="acknowledgement_master" - app:title="@string/settings_acknowledgement_master_title" - app:fragment="Settings.AcknowledgementFragment" /> + app:title="@string/settings_about_master_title" + app:fragment="Settings.AboutPreferenceFragment" /> </androidx.preference.PreferenceScreen>
\ No newline at end of file |
