diff options
35 files changed, 5 insertions, 818 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java index 1cb8956a..fccfc347 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java @@ -24,7 +24,6 @@ import ml.docilealligator.infinityforreddit.activities.EditProfileActivity; import ml.docilealligator.infinityforreddit.activities.FetchRandomSubredditOrPostActivity; import ml.docilealligator.infinityforreddit.activities.FilteredPostsActivity; import ml.docilealligator.infinityforreddit.activities.FullMarkdownActivity; -import ml.docilealligator.infinityforreddit.activities.GiveAwardActivity; import ml.docilealligator.infinityforreddit.activities.HistoryActivity; import ml.docilealligator.infinityforreddit.activities.InboxActivity; import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity; @@ -248,8 +247,6 @@ public interface AppComponent { void inject(CustomizeBottomAppBarFragment customizeBottomAppBarFragment); - void inject(GiveAwardActivity giveAwardActivity); - void inject(TranslationFragment translationFragment); void inject(FetchRandomSubredditOrPostActivity fetchRandomSubredditOrPostActivity); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/GiveAwardActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/GiveAwardActivity.java deleted file mode 100644 index 8803e96a..00000000 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/GiveAwardActivity.java +++ /dev/null @@ -1,195 +0,0 @@ -package ml.docilealligator.infinityforreddit.activities; - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Build; -import android.os.Bundle; -import android.os.Handler; -import android.view.LayoutInflater; -import android.view.MenuItem; -import android.view.View; -import android.widget.TextView; -import android.widget.Toast; - -import androidx.annotation.NonNull; -import androidx.appcompat.widget.Toolbar; -import androidx.coordinatorlayout.widget.CoordinatorLayout; -import androidx.recyclerview.widget.RecyclerView; - -import com.google.android.material.appbar.AppBarLayout; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.google.android.material.materialswitch.MaterialSwitch; - -import java.util.concurrent.Executor; - -import javax.inject.Inject; -import javax.inject.Named; - -import butterknife.BindView; -import butterknife.ButterKnife; -import ml.docilealligator.infinityforreddit.Infinity; -import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; -import ml.docilealligator.infinityforreddit.adapters.AwardRecyclerViewAdapter; -import ml.docilealligator.infinityforreddit.award.GiveAward; -import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; -import ml.docilealligator.infinityforreddit.customviews.LinearLayoutManagerBugFixed; -import ml.docilealligator.infinityforreddit.customviews.slidr.Slidr; -import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils; -import retrofit2.Retrofit; - -public class GiveAwardActivity extends BaseActivity { - - public static final String EXTRA_THING_FULLNAME = "ETF"; - public static final String EXTRA_ITEM_POSITION = "EIP"; - public static final String EXTRA_RETURN_ITEM_POSITION = "ERIP"; - public static final String EXTRA_RETURN_NEW_AWARDS = "ERNA"; - public static final String EXTRA_RETURN_NEW_AWARDS_COUNT = "ERNAC"; - - @BindView(R.id.coordinator_layout_give_award_activity) - CoordinatorLayout coordinatorLayout; - @BindView(R.id.appbar_layout_give_award_activity) - AppBarLayout appBarLayout; - @BindView(R.id.toolbar_give_award_activity) - Toolbar toolbar; - @BindView(R.id.recycler_view_give_award_activity) - RecyclerView recyclerView; - @Inject - @Named("oauth") - Retrofit mOauthRetrofit; - @Inject - RedditDataRoomDatabase mRedditDataRoomDatabase; - @Inject - @Named("default") - SharedPreferences mSharedPreferences; - @Inject - @Named("current_account") - SharedPreferences mCurrentAccountSharedPreferences; - @Inject - CustomThemeWrapper mCustomThemeWrapper; - @Inject - Executor mExecutor; - private String thingFullname; - private int itemPosition; - private String mAccessToken; - private AwardRecyclerViewAdapter adapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - ((Infinity) getApplication()).getAppComponent().inject(this); - - setImmersiveModeNotApplicable(); - - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_give_award); - - ButterKnife.bind(this); - - applyCustomTheme(); - - setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) { - Slidr.attach(this); - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (isChangeStatusBarIconColor()) { - addOnOffsetChangedListener(appBarLayout); - } - } - - thingFullname = getIntent().getStringExtra(EXTRA_THING_FULLNAME); - itemPosition = getIntent().getIntExtra(EXTRA_ITEM_POSITION, 0); - - mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null); - - bindView(); - } - - private void bindView() { - adapter = new AwardRecyclerViewAdapter(this, mCustomThemeWrapper, award -> { - LayoutInflater inflater = getLayoutInflater(); - View layout = inflater.inflate(R.layout.dialog_give_award, null); - MaterialSwitch materialSwitch = layout.findViewById(R.id.switch_material_give_award_dialog); - new MaterialAlertDialogBuilder(this) - .setTitle(R.string.give_award_dialog_title) - .setView(layout) - .setPositiveButton(R.string.yes, (dialogInterface, i) -> { - boolean isAnonymous = materialSwitch.isChecked(); - - GiveAward.giveAwardV2(mExecutor, new Handler(), mOauthRetrofit, mAccessToken, - thingFullname, award.getId(), isAnonymous, new GiveAward.GiveAwardListener() { - @Override - public void success(String awardsHTML, int awardCount) { - Intent data = new Intent(); - data.putExtra(EXTRA_RETURN_ITEM_POSITION, itemPosition); - data.putExtra(EXTRA_RETURN_NEW_AWARDS, awardsHTML); - data.putExtra(EXTRA_RETURN_NEW_AWARDS_COUNT, awardCount); - setResult(RESULT_OK, data); - finish(); - } - - @Override - public void failed(int code, String message) { - View layout = inflater.inflate(R.layout.copy_text_material_dialog, null); - TextView textView = layout.findViewById(R.id.text_view_copy_text_material_dialog); - String text = getString(R.string.give_award_error_message, code, message == null ? "" : message); - textView.setText(text); - new MaterialAlertDialogBuilder(GiveAwardActivity.this, R.style.CopyTextMaterialAlertDialogTheme) - .setTitle(R.string.give_award_failed) - .setView(layout) - .setPositiveButton(R.string.copy_all, (dialogInterface, i) -> { - ClipboardManager clipboard = (ClipboardManager) GiveAwardActivity.this.getSystemService(Context.CLIPBOARD_SERVICE); - if (clipboard != null) { - ClipData clip = ClipData.newPlainText("simple text", text); - clipboard.setPrimaryClip(clip); - if (android.os.Build.VERSION.SDK_INT < 33) { - Toast.makeText(GiveAwardActivity.this, R.string.copy_success, Toast.LENGTH_SHORT).show(); - } - } else { - Toast.makeText(GiveAwardActivity.this, R.string.copy_failed, Toast.LENGTH_SHORT).show(); - } - }) - .setNegativeButton(R.string.cancel, null) - .show(); - } - }); - }) - .setNegativeButton(R.string.no, null) - .show(); - }); - recyclerView.setLayoutManager(new LinearLayoutManagerBugFixed(this)); - recyclerView.setAdapter(adapter); - } - - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - if (item.getItemId() == android.R.id.home) { - finish(); - return true; - } - - return false; - } - - @Override - protected SharedPreferences getDefaultSharedPreferences() { - return mSharedPreferences; - } - - @Override - protected CustomThemeWrapper getCustomThemeWrapper() { - return mCustomThemeWrapper; - } - - @Override - protected void applyCustomTheme() { - coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor()); - applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, null, toolbar); - } -}
\ No newline at end of file diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java index 2321b328..76fec098 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java @@ -99,7 +99,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele public static final String EXTRA_POST_FRAGMENT_ID = "EPFI"; public static final String EXTRA_IS_NSFW_SUBREDDIT = "EINS"; public static final int EDIT_COMMENT_REQUEST_CODE = 3; - public static final int GIVE_AWARD_REQUEST_CODE = 100; @State String mNewAccountName; @BindView(R.id.coordinator_layout_view_post_detail) @@ -778,14 +777,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele data.getStringExtra(EditCommentActivity.EXTRA_EDITED_COMMENT_CONTENT), data.getExtras().getInt(EditCommentActivity.EXTRA_EDITED_COMMENT_POSITION)); } - } else if (requestCode == GIVE_AWARD_REQUEST_CODE) { - if (data != null && resultCode == Activity.RESULT_OK) { - Toast.makeText(this, R.string.give_award_success, Toast.LENGTH_SHORT).show(); - int position = data.getIntExtra(GiveAwardActivity.EXTRA_RETURN_ITEM_POSITION, 0); - String newAwardsHTML = data.getStringExtra(GiveAwardActivity.EXTRA_RETURN_NEW_AWARDS); - int newAwardsCount = data.getIntExtra(GiveAwardActivity.EXTRA_RETURN_NEW_AWARDS_COUNT, 0); - awardGiven(newAwardsHTML, newAwardsCount, position); - } } else if (requestCode == CommentActivity.WRITE_COMMENT_REQUEST_CODE) { if (data != null && resultCode == Activity.RESULT_OK) { if (data.hasExtra(RETURN_EXTRA_COMMENT_DATA_KEY)) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java index 66ea8eb9..803e0ddf 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewUserDetailActivity.java @@ -133,7 +133,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele public static final String EXTRA_USER_NAME_KEY = "EUNK"; public static final String EXTRA_MESSAGE_FULLNAME = "ENF"; public static final String EXTRA_NEW_ACCOUNT_NAME = "ENAN"; - public static final int GIVE_AWARD_REQUEST_CODE = 200; public static final int EDIT_COMMENT_REQUEST_CODE = 300; public static final int ADD_TO_MULTIREDDIT_REQUEST_CODE = 400; @@ -1219,14 +1218,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data); if (resultCode == RESULT_OK) { - if (requestCode == GIVE_AWARD_REQUEST_CODE) { - Toast.makeText(this, R.string.give_award_success, Toast.LENGTH_SHORT).show(); - int position = data.getIntExtra(GiveAwardActivity.EXTRA_RETURN_ITEM_POSITION, 0); - String newAwardsHTML = data.getStringExtra(GiveAwardActivity.EXTRA_RETURN_NEW_AWARDS); - if (sectionsPagerAdapter != null) { - sectionsPagerAdapter.giveAward(newAwardsHTML, position); - } - } else if (requestCode == EDIT_COMMENT_REQUEST_CODE) { + if (requestCode == EDIT_COMMENT_REQUEST_CODE) { if (data != null) { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.editComment( diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AwardRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AwardRecyclerViewAdapter.java deleted file mode 100644 index 8d0e9688..00000000 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/AwardRecyclerViewAdapter.java +++ /dev/null @@ -1,107 +0,0 @@ -package ml.docilealligator.infinityforreddit.adapters; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.RequestManager; - -import java.util.ArrayList; - -import butterknife.BindView; -import butterknife.ButterKnife; -import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.activities.BaseActivity; -import ml.docilealligator.infinityforreddit.award.Award; -import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; -import pl.droidsonroids.gif.GifImageView; - -public class AwardRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { - - private ArrayList<Award> awards; - private BaseActivity activity; - private RequestManager glide; - private ItemOnClickListener itemOnClickListener; - private int primaryTextColor; - private int secondaryTextColor; - - public interface ItemOnClickListener { - void onClick(Award award); - } - - public AwardRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper, - ItemOnClickListener itemOnClickListener) { - awards = Award.getAvailableAwards(); - this.activity = activity; - this.glide = Glide.with(activity); - primaryTextColor = customThemeWrapper.getPrimaryTextColor(); - secondaryTextColor = customThemeWrapper.getSecondaryTextColor(); - this.itemOnClickListener = itemOnClickListener; - } - - @NonNull - @Override - public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new AwardViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_award, parent, false)); - } - - @Override - public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { - if (holder instanceof AwardViewHolder) { - Award award = awards.get(position); - glide.load(award.getIconUrl()).into(((AwardViewHolder) holder).iconImageView); - ((AwardViewHolder) holder).nameTextView.setText(award.getName()); - ((AwardViewHolder) holder).descriptionTextView.setText(award.getDescription()); - ((AwardViewHolder) holder).coinTextView.setText(Integer.toString(award.getCoinPrice())); - } - } - - @Override - public int getItemCount() { - return awards.size(); - } - - @Override - public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) { - super.onViewRecycled(holder); - if (holder instanceof AwardViewHolder) { - glide.clear(((AwardViewHolder) holder).iconImageView); - ((AwardViewHolder) holder).nameTextView.setText(""); - ((AwardViewHolder) holder).descriptionTextView.setText(""); - } - } - - class AwardViewHolder extends RecyclerView.ViewHolder { - @BindView(R.id.icon_image_view_item_award) - GifImageView iconImageView; - @BindView(R.id.name_text_view_item_award) - TextView nameTextView; - @BindView(R.id.description_text_view_item_award) - TextView descriptionTextView; - @BindView(R.id.coin_text_view_item_award) - TextView coinTextView; - - public AwardViewHolder(@NonNull View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - - if (activity.typeface != null) { - nameTextView.setTypeface(activity.typeface); - descriptionTextView.setTypeface(activity.typeface); - coinTextView.setTypeface(activity.typeface); - } - nameTextView.setTextColor(primaryTextColor); - descriptionTextView.setTextColor(secondaryTextColor); - coinTextView.setTextColor(primaryTextColor); - - itemView.setOnClickListener(view -> { - itemOnClickListener.onClick(awards.get(getBindingAdapterPosition())); - }); - } - } -} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/award/Award.java b/app/src/main/java/ml/docilealligator/infinityforreddit/award/Award.java deleted file mode 100644 index 5188702d..00000000 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/award/Award.java +++ /dev/null @@ -1,143 +0,0 @@ -package ml.docilealligator.infinityforreddit.award; - -import java.util.ArrayList; - -public class Award { - private String id; - private String awardSubType; - private String name; - private String description; - private String iconUrl; - private int coinPrice; - - public Award(String id, String awardSubType, String name, String description, String iconUrl, int coinPrice) { - this.id = id; - this.awardSubType = awardSubType; - this.name = name; - this.description = description; - this.iconUrl = iconUrl; - this.coinPrice = coinPrice; - } - - public static ArrayList<Award> getAvailableAwards() { - ArrayList<Award> awards = new ArrayList<>(); - awards.add(new Award("gid_2", "GLOBAL", "Gold", "Gives the author a week of Reddit Premium, 100 Coins to do with as they please, and shows a Gold Award.", "https://www.redditstatic.com/gold/awards/icon/gold_512.png", 500)); - awards.add(new Award("gid_3", "GLOBAL", "Platinum", "Gives the author a month of Reddit Premium, which includes 700 Coins for that month, and shows a Platinum Award.", "https://www.redditstatic.com/gold/awards/icon/platinum_512.png", 1800)); - awards.add(new Award("award_4ca5a4e6-8873-4ac5-99b9-71b1d5161a91", "GLOBAL", "Argentium", "Latin for distinguished. Shimmers like silver & stronger than steel. When someone deserves outsize recognition. This award gives a three-month Premium subscription and 2500 coins to the recipient.", "https://www.redditstatic.com/gold/awards/icon/Mithril_512.png", 20000)); - awards.add(new Award("award_2385c499-a1fb-44ec-b9b7-d260f3dc55de", "GLOBAL", "Ternion All-Powerful", "Legendary level. A no holds barred celebration of something that hits you in the heart, mind and soul. Some might call it unachievanium. Gives the author 6 months of Premium and 5000 Coins.", "https://www.redditstatic.com/gold/awards/icon/Trinity_512.png", 50000)); - awards.add(new Award("gid_1", "GLOBAL", "Silver", "Shows the Silver Award... and that's it.", "https://www.redditstatic.com/gold/awards/icon/silver_512.png", 100)); - awards.add(new Award("award_e55d1889-11f2-4d04-8abb-44b1de7dd53d", "GLOBAL", "Aww-some", "Use the Aww-some Award to highlight comments that are absolutely adorable.", "https://www.redditstatic.com/gold/awards/icon/Awwsome_512.png", 350)); - awards.add(new Award("award_11eb6af3-3d0d-4d70-8261-22d216ab591d", "GLOBAL", "Heartbeat", "Use the Heartbeat Award to highlight comments that make you feel warm and fuzzy", "https://www.redditstatic.com/gold/awards/icon/Heartbeat_512.png", 350)); - awards.add(new Award("award_0e957fb0-c8f1-4ba1-a8ef-e1e524b60d7d", "GLOBAL", "Starry", "Use the Starry Award to highlight comments that deserve to stand out from the crowd.", "https://www.redditstatic.com/gold/awards/icon/Starry_512.png", 500)); - awards.add(new Award("award_75f9bc56-eba3-4988-a1af-aec974404a0b", "GROUP", "Super Medal Train", "All aboard! Every 5 Awards gives the author 100 Coins and 1 week of Premium. Rack up the number of Awards and watch the Train level-up.", "https://i.redd.it/award_images/t5_22cerq/v3wyujfap4p51_SuperMedalTrain.png", 125)); - awards.add(new Award("award_7149a401-1223-4543-bfd6-4127cb4246da", "GLOBAL", "Cool Summer", "The key is to keep your cool this summer.", "https://i.redd.it/award_images/t5_22cerq/1m9abin81nc51_CoolSummer.png", 50)); - awards.add(new Award("award_02d9ab2c-162e-4c01-8438-317a016ed3d9", "GLOBAL", "Take My Energy", "I'm in this with you.", "https://i.redd.it/award_images/t5_22cerq/898sygoknoo41_TakeMyEnergy.png", 50)); - awards.add(new Award("award_7becef23-fb0b-4d62-b8a6-01d5759367cb", "GLOBAL", "Faith In Humanity Restored", "When goodness lifts you", "https://i.redd.it/award_images/t5_22cerq/gva4vt20qc751_FaithInHumanityRestored.png", 70)); - awards.add(new Award("award_84276b1e-cc8f-484f-a19c-be6c09adc1a5", "GLOBAL", "Bravo!", "An amazing showing.", "https://www.redditstatic.com/gold/awards/icon/SnooClapping_512.png", 400)); - awards.add(new Award("award_68ba1ee3-9baf-4252-be52-b808c1e8bdc4", "GLOBAL", "This", "Me approved", "https://i.redd.it/award_images/t5_22cerq/vu6om0xnb7e41_This.png", 300)); - awards.add(new Award("award_1f0462ee-18f5-4f33-89cf-f1f79336a452", "GLOBAL", "Wholesome (Pro)", "When you come across a feel-good thing. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/0o2j782f00e41_WholesomeSuperpro.png", 500)); - awards.add(new Award("award_3dd248bc-3438-4c5b-98d4-24421fd6d670", "GLOBAL", "Coin Gift", "Give the gift of 250 Reddit Coins.", "https://i.redd.it/award_images/t5_22cerq/cr1mq4yysv541_CoinGift.png", 300)); - awards.add(new Award("award_2ae56630-cfe0-424e-b810-4945b9145358", "GLOBAL", "Helpful (Pro)", "Thank you stranger. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/trz28na8ajz31_Helpful.png", 500)); - awards.add(new Award("award_6220ecfe-4552-4949-aa13-fb1fb7db537c", "GLOBAL", "Super Heart Eyes", "When the love is out of control.", "https://www.redditstatic.com/gold/awards/icon/Superheart_512.png", 325)); - awards.add(new Award("award_5b39e8fd-7a58-4cbe-8ca0-bdedd5ed1f5a", "GLOBAL", "Doot 🎵 Doot", "Sometimes you just got to dance with the doots.", "https://www.redditstatic.com/gold/awards/icon/Updoot_512.png", 400)); - awards.add(new Award("award_9f928aff-c9f5-4e7e-aa91-8619dce60f1c", "GLOBAL", "Table Slap", "When laughter meets percussion", "https://www.redditstatic.com/gold/awards/icon/TableSlap_512.png", 325)); - awards.add(new Award("award_3409a4c0-ba69-43a0-be9f-27bc27c159cc", "GLOBAL", "Spit-take", "Shower them with laughs", "https://www.redditstatic.com/gold/awards/icon/Spits_drink_512.png", 325)); - awards.add(new Award("award_3267ca1c-127a-49e9-9a3d-4ba96224af18", "GLOBAL", "I'll Drink to That", "Let's sip to good health and good company", "https://i.redd.it/award_images/t5_22cerq/45aeu8mzvsj51_IllDrinktoThat.png", 100)); - awards.add(new Award("award_31260000-2f4a-4b40-ad20-f5aa46a577bf", "APPRECIATION", "Timeless Beauty", "Beauty that's forever. Gives 100 Coins each to the author and the community.", "https://i.redd.it/award_images/t5_22cerq/crhlsu5wzlc41_TimelessBeauty.png", 250)); - awards.add(new Award("award_69c94eb4-d6a3-48e7-9cf2-0f39fed8b87c", "GLOBAL", "Ally", "Listen, get educated, and get involved.", "https://i.redd.it/award_images/t5_22cerq/5nswjpyy44551_Ally.png", 50)); - awards.add(new Award("award_a903c949-ccc5-420d-8239-1bbefc424838", "GLOBAL", "Healthcare Hero", "Putting yourself on the line for us - you are the perfect super hero!", "https://i.redd.it/award_images/t5_22cerq/xs2na1t1v9p41_HealthcareHero.png", 50)); - awards.add(new Award("award_03c4f93d-efc7-463b-98a7-c01814462ab0", "GLOBAL", "I am disappoint", "I'm not mad, I'm just disappointed.", "https://i.redd.it/award_images/t5_22cerq/3ekkailk5s551_Iamdisappoint.png", 50)); - awards.add(new Award("award_d33fddd7-a58a-4472-b1a2-3157d8c8b76f", "GLOBAL", "Looking Busy", "Looking like you're working is hard work.", "https://i.redd.it/award_images/t5_22cerq/k0qzautvyyk51_LookingBusy.png", 50)); - awards.add(new Award("award_e1b2bf9e-8c62-4edc-9b6d-ffa44a7cb53b", "GLOBAL", "Recharge", "Feeling relaxed and restored", "https://i.redd.it/award_images/t5_22cerq/0lurnbnhqkl51_Recharge.png", 50)); - awards.add(new Award("award_80d4d339-95d0-43ac-b051-bc3fe0a9bab8", "GLOBAL", "Wearing is Caring", "Keep the community and yourself healthy and happy.", "https://i.redd.it/award_images/t5_22cerq/lcswc5d07hb51_WearingisCaring.png", 50)); - awards.add(new Award("award_b1b44fa1-8179-4d84-a9ed-f25bb81f1c5f", "GLOBAL", "Facepalm", "*Lowers face into palm*", "https://i.redd.it/award_images/t5_22cerq/ey2iodron2s41_Facepalm.png", 70)); - awards.add(new Award("award_99d95969-6100-45b2-b00c-0ec45ae19596", "GLOBAL", "Snek", "A smol, delicate danger noodle.", "https://i.redd.it/award_images/t5_22cerq/rc5iesz2z8t41_Snek.png", 70)); - awards.add(new Award("award_b92370bb-b7de-4fb3-9608-c5b4a22f714a", "GLOBAL", "Tree Hug", "Show nature some love.", "https://i.redd.it/award_images/t5_22cerq/fukjtec638u41_TreeHug.png", 70)); - awards.add(new Award("award_ae89e420-c4a5-47b8-a007-5dacf1c0f0d4", "GLOBAL", "Lawyer Up", "OBJECTION!", "https://i.redd.it/award_images/t5_22cerq/iq0sgwn5bzy41_LawyerUp.png", 75)); - awards.add(new Award("award_8352bdff-3e03-4189-8a08-82501dd8f835", "GLOBAL", "Hugz", "Everything is better with a good hug", "https://i.redd.it/award_images/t5_22cerq/niiatoknifn51_Hugz.png", 80)); - awards.add(new Award("award_869d4135-8738-41e5-8630-de593b4f049f", "GLOBAL", "'MURICA", "Did somebody say 'Murica?", "https://i.redd.it/award_images/t5_22cerq/18mwqw5th9e51_MURICA.png", 100)); - awards.add(new Award("award_81cf5c92-8500-498c-9c94-3e4034cece0a", "GLOBAL", "Dread", "Staring into the abyss and it's staring right back", "https://i.redd.it/award_images/t5_22cerq/nvfe4gyawnf51_Dread.png", 100)); - awards.add(new Award("award_483d8e29-bbe5-404e-a09a-c2d7b16c4fff", "GLOBAL", "Evil Cackle", "Laugh like a supervillain", "https://i.redd.it/award_images/t5_22cerq/43zl6dfcg9e51_EvilCackle.png", 100)); - awards.add(new Award("award_74fe5152-7906-4991-9016-bc2d8e261200", "GLOBAL", "Excited", "I don't know what to do with my hands!", "https://i.redd.it/award_images/t5_22cerq/x069ow7ewnf51_Excited.png", 100)); - awards.add(new Award("award_01178870-6a4f-4172-8f36-9ed5092ee4f9", "GLOBAL", "Glow Up", "You look amazing, glowing, incredible!", "https://i.redd.it/award_images/t5_22cerq/2754pa5jvsj51_GlowUp.png", 100)); - awards.add(new Award("award_19860e30-3331-4bac-b3d1-bd28de0c7974", "GLOBAL", "Heartwarming", "I needed this today", "https://i.redd.it/award_images/t5_22cerq/v1mxw8i6wnf51_Heartwarming.png", 100)); - awards.add(new Award("award_1da6ff27-7c0d-4524-9954-86e5cda5fcac", "GLOBAL", "Keep Calm", "Stop, chill, relax", "https://i.redd.it/award_images/t5_22cerq/g77c4oud7hb51_KeepCalm.png", 100)); - awards.add(new Award("award_1e516e18-cbee-4668-b338-32d5530f91fe", "GLOBAL", "Kiss", "You deserve a smooch", "https://i.redd.it/award_images/t5_22cerq/sb42u5gmwsj51_Kiss.png", 100)); - awards.add(new Award("award_b4072731-c0fb-4440-adc7-1063d6a5e6a0", "GLOBAL", "Masterpiece", "C'est magnifique", "https://i.redd.it/award_images/t5_22cerq/2juh333m40n51_Masterpiece.png", 100)); - awards.add(new Award("award_fbe9527a-adb3-430e-af1a-5fd3489e641b", "GLOBAL", "Shocked", "I'm genuinely flabbergasted.", "https://i.redd.it/award_images/t5_22cerq/fck3iedi2ug51_Shocked.png", 100)); - awards.add(new Award("award_0b41ba9b-8ad9-42c8-85b1-942d5462c830", "GLOBAL", "Starts Recording", "This should be good", "https://i.redd.it/award_images/t5_22cerq/zlrdwu9kh9e51_StartsRecording.png", 100)); - awards.add(new Award("award_43f3bf99-92d6-47ab-8205-130d26e7929f", "GLOBAL", "Tearing Up", "This hits me right in the feels", "https://i.redd.it/award_images/t5_22cerq/lop66ut2wnf51_TearingUp.png", 100)); - awards.add(new Award("award_ae7f17fb-6538-4c75-9ff4-5f48b4cdaa94", "GLOBAL", "Yummy", "That looks so good", "https://i.redd.it/award_images/t5_22cerq/a7dhg27hvnf51_Yummy.png", 100)); - awards.add(new Award("award_5f123e3d-4f48-42f4-9c11-e98b566d5897", "GLOBAL", "Wholesome", "When you come across a feel-good thing.", "https://i.redd.it/award_images/t5_22cerq/5izbv4fn0md41_Wholesome.png", 125)); - awards.add(new Award("award_77ba55a2-c33c-4351-ac49-807455a80148", "GLOBAL", "Bless Up", "Prayers up for the blessed.", "https://i.redd.it/award_images/t5_22cerq/trfv6ems1md41_BlessUp.png", 150)); - awards.add(new Award("award_c42dc561-0b41-40b6-a23d-ef7e110e739e", "GLOBAL", "Buff Doge", "So buff, wow", "https://i.redd.it/award_images/t5_22cerq/zc4a9vk5zmc51_BuffDoge.png", 150)); - awards.add(new Award("award_f44611f1-b89e-46dc-97fe-892280b13b82", "GLOBAL", "Helpful", "Thank you stranger. Shows the award.", "https://i.redd.it/award_images/t5_22cerq/klvxk1wggfd41_Helpful.png", 150)); - awards.add(new Award("award_88fdcafc-57a0-48db-99cc-76276bfaf28b", "GLOBAL", "Press F", "To pay respects.", "https://i.redd.it/award_images/t5_22cerq/tcofsbf92md41_PressF.png", 150)); - awards.add(new Award("award_a7f9cbd7-c0f1-4569-a913-ebf8d18de00b", "GLOBAL", "Take My Money", "I'm buying what you're selling", "https://i.redd.it/award_images/t5_22cerq/9jr8pv84v7i51_TakeMyMoney.png", 150)); - awards.add(new Award("award_a9968927-3f72-4af9-8bcd-aaf804838dc6", "GLOBAL", "Back Away", "...slowly", "https://i.redd.it/award_images/t5_22cerq/t5z1oc8t2ug51_BackAway.png", 200)); - awards.add(new Award("award_e813313c-1002-49bf-ac37-e966710f605f", "GLOBAL", "Giggle", "Innocent laughter", "https://www.redditstatic.com/gold/awards/icon/Giggle_512.png", 200)); - awards.add(new Award("award_1703f934-cf44-40cc-a96d-3729d0b48262", "GLOBAL", "I'd Like to Thank...", "My kindergarten teacher, my cat, my mom, and you.", "https://i.redd.it/award_images/t5_22cerq/8ad2jffnclf41_Thanks.png", 200)); - awards.add(new Award("award_b28d9565-4137-433d-bb65-5d4aa82ade4c", "GLOBAL", "I'm Deceased", "Call an ambulance, I'm laughing too hard.", "https://i.redd.it/award_images/t5_22cerq/2jd92wtn25g41_ImDeceased.png", 200)); - awards.add(new Award("award_4922c1be-3646-4d62-96ea-19a56798df51", "GLOBAL", "Looking", "I can't help but look.", "https://i.redd.it/award_images/t5_22cerq/kjpl76213ug51_Looking.png", 200)); - awards.add(new Award("award_9ee30a8f-463e-4ef7-9da9-a09f270ec026", "GLOBAL", "Stonks Falling", "Losing value fast.", "https://i.redd.it/award_images/t5_22cerq/ree13odobef41_StonksFalling.png", 200)); - awards.add(new Award("award_d125d124-5c03-490d-af3d-d07c462003da", "GLOBAL", "Stonks Rising", "To the MOON.", "https://i.redd.it/award_images/t5_22cerq/s5edqq9abef41_StonksRising.png", 200)); - awards.add(new Award("award_dc391ef9-0df8-468f-bd3c-7b177092de35", "GLOBAL", "This is 2020", "Every reason to be alarmed", "https://i.redd.it/award_images/t5_22cerq/ncon692ev7i51_Thisis2020.png", 200)); - awards.add(new Award("award_11be92ba-509e-46d3-991b-593239006521", "GLOBAL", "1UP", "Extra life", "https://www.redditstatic.com/gold/awards/icon/Levelup_512.png", 250)); - awards.add(new Award("award_351f8639-ee3b-4def-adf3-6b39980c278a", "GLOBAL", "2020 Vision", "Looking into the present.", "https://i.redd.it/award_images/t5_22cerq/48eychq6e9741_2020Vision.png", 300)); - awards.add(new Award("award_cc299d65-77de-4828-89de-708b088349a0", "GLOBAL", "GOAT", "Historical anomaly - greatest in eternity.", "https://i.redd.it/award_images/t5_22cerq/x52x5be57fd41_GOAT.png", 300)); - awards.add(new Award("award_8dc476c7-1478-4d41-b940-f139e58f7756", "GLOBAL", "Got the W", "", "https://i.redd.it/award_images/t5_22cerq/9avdcwgupta41_GottheW.png", 300)); - awards.add(new Award("award_28e8196b-d4e9-45bc-b612-cd4c7d3ed4b3", "GLOBAL", "Rocket Like", "When an upvote just isn't enough, smash the Rocket Like.", "https://i.redd.it/award_images/t5_22cerq/94pn64yuas941_RocketLike.png", 300)); - awards.add(new Award("award_3e000ecb-c1a4-49dc-af14-c8ac2029ca97", "GLOBAL", "Table Flip", "ARGH!", "https://i.redd.it/award_images/t5_22cerq/a05z7bb9v7i51_TableFlip.png", 300)); - awards.add(new Award("award_725b427d-320b-4d02-8fb0-8bb7aa7b78aa", "GLOBAL", "Updoot", "Sometimes you just got to doot.", "https://i.redd.it/award_images/t5_22cerq/7atjjqpy1mc41_Updoot.png", 300)); - awards.add(new Award("award_c043e7ef-8514-4862-99c6-45e36cec4f66", "GLOBAL", "OOF", "That hurts", "https://www.redditstatic.com/gold/awards/icon/OOF_512.png", 325)); - awards.add(new Award("award_2bc47247-b107-44a8-a78c-613da21869ff", "GLOBAL", "To The Stars", "Boldly go where we haven't been in a long, long time.", "https://www.redditstatic.com/gold/awards/icon/Rocket_512.png", 325)); - awards.add(new Award("award_2ff1fdd0-ff73-47e6-a43c-bde6d4de8fbd", "GLOBAL", "Into the Magic Portal", "Hope to make it to the other side.", "https://www.redditstatic.com/gold/awards/icon/TeleportIn_512.png", 350)); - awards.add(new Award("award_7fe72f36-1141-4a39-ba76-0d481889b390", "GLOBAL", "Out of the Magic Portal", "That was fun, but I'm glad to be back", "https://www.redditstatic.com/gold/awards/icon/TeleportOut_512.png", 350)); - awards.add(new Award("award_f7a4fd5e-7cd1-4c11-a1c9-c18d05902e81", "GLOBAL", "Crab Rave", "[Happy crab noises]", "https://www.redditstatic.com/gold/awards/icon/CrabRave_512.png", 400)); - awards.add(new Award("award_43c43a35-15c5-4f73-91ef-fe538426435a", "GLOBAL", "Bless Up (Pro)", "Prayers up for the blessed. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/xe5mw55w5v541_BlessUp.png", 500)); - awards.add(new Award("award_27d3176c-b388-4616-80ec-11b8ece5b7ee", "GLOBAL", "Snoo Nice", "Gives the author a week of Reddit Premium and 100 Coins to do with as they please.", "https://i.redd.it/award_images/t5_22cerq/9r7hexe6pta41_SnooNice.png", 500)); - awards.add(new Award("award_35c78e6e-507b-4f1d-b3d8-ed43840909a8", "GLOBAL", "Pot o' Coins", "The treasure at the end of the rainbow. Gives the author 800 Coins to do with as they please.", "https://i.redd.it/award_images/t5_22cerq/wg3lzllyg9n41_PotoCoins.png", 1000)); - awards.add(new Award("award_5eac457f-ebac-449b-93a7-eb17b557f03c", "PREMIUM", "LOVE!", "When you follow your heart, love is the answer", "https://i.redd.it/award_images/t5_22cerq/j3azv69qjfn51_LOVE.png", 20)); - awards.add(new Award("award_abb865cf-620b-4219-8777-3658cf9091fb", "PREMIUM", "Starstruck", "Can't stop seeing stars", "https://www.redditstatic.com/gold/awards/icon/Starstruck_512.png", 20)); - awards.add(new Award("award_b4ff447e-05a5-42dc-9002-63568807cfe6", "PREMIUM", "All-Seeing Upvote", "A glowing commendation for all to see", "https://i.redd.it/award_images/t5_22cerq/rg960rc47jj41_All-SeeingUpvote.png", 30)); - awards.add(new Award("award_a2506925-fc82-4d6c-ae3b-b7217e09d7f0", "PREMIUM", "Narwhal Salute", "A golden splash of respect", "https://i.redd.it/award_images/t5_22cerq/80j20o397jj41_NarwhalSalute.png", 30)); - awards.add(new Award("award_c4b2e438-16bb-4568-88e7-7893b7662944", "PREMIUM", "Wholesome Seal of Approval", "A glittering stamp for a feel-good thing", "https://i.redd.it/award_images/t5_22cerq/b9ks3a5k7jj41_WholesomeSealofApproval.png", 30)); - awards.add(new Award("award_9663243a-e77f-44cf-abc6-850ead2cd18d", "PREMIUM", "Bravo Grande!", "For an especially amazing showing.", "https://www.redditstatic.com/gold/awards/icon/SnooClappingPremium_512.png", 75)); - awards.add(new Award("award_92cb6518-a71a-4217-9f8f-7ecbd7ab12ba", "PREMIUM", "Take My Power", "Add my power to yours.", "https://www.redditstatic.com/gold/awards/icon/TakeMyPower_512.png", 75)); - awards.add(new Award("award_5fb42699-4911-42a2-884c-6fc8bdc36059", "APPRECIATION", "Cake", "Did someone say... cake?", "https://i.redd.it/award_images/t5_22cerq/aoa99054n2s41_Cake.png", 150)); - awards.add(new Award("award_f7562045-905d-413e-9ed2-0a16d4bfe349", "APPRECIATION", "Plus One", "You officially endorse and add your voice to the crowd.", "https://i.redd.it/award_images/t5_22cerq/6vgr8y21i9741_PlusOne.png", 200)); - awards.add(new Award("award_2adc49e8-d6c9-4923-9293-2bfab1648569", "APPRECIATION", "Awesome Answer", "For a winning take and the kind soul who nails a question. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/71v56o5a5v541_AwesomeAnswer.png", 250)); - awards.add(new Award("award_cc540de7-dfdb-4a68-9acf-6f9ce6b17d21", "APPRECIATION", "It's Cute!", "You made me UwU.", "https://i.redd.it/award_images/t5_22cerq/n94bgm83in941_ItsCute.png", 250)); - awards.add(new Award("award_9583d210-a7d0-4f3c-b0c7-369ad579d3d4", "APPRECIATION", "Mind Blown", "When a thing immediately combusts your brain. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/wa987k0p4v541_MindBlown.png", 250)); - awards.add(new Award("award_d306c865-0d49-4a36-a1ab-a4122a0e3480", "APPRECIATION", "Original", "When something new and creative wows you. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/b8xt4z8yajz31_Original.png", 250)); - awards.add(new Award("award_a67d649d-5aa5-407e-a98b-32fd9e3a9696", "APPRECIATION", "Today I Learned", "The more you know... Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/bph2png4ajz31_TodayILearned.png", 250)); - awards.add(new Award("award_d48aad4b-286f-4a3a-bb41-ec05b3cd87cc", "APPRECIATION", "Yas Queen", "YAAAAAAAAAAASSS.", "https://i.redd.it/award_images/t5_22cerq/kthj3e4h3bm41_YasQueen.png", 250)); - awards.add(new Award("award_a9009ea5-1a36-42ae-aab2-5967563ee054", "APPRECIATION", "Heart Eyes", "For love at first sight. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/12kz7a7j4v541_HeartEyes.png", 500)); - awards.add(new Award("award_a7a04d6a-8dd8-41bb-b906-04fa8f144014", "APPRECIATION", "Made Me Smile", "When you're smiling before you know it. Gives 100 Coins to both the author and the community.", "https://i.redd.it/award_images/t5_22cerq/hwnbr9l67s941_MadeMeSmile.png", 500)); - return awards; - } - - public String getId() { - return id; - } - - public String getAwardSubType() { - return awardSubType; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; - } - - public String getIconUrl() { - return iconUrl; - } - - public int getCoinPrice() { - return coinPrice; - } -} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/award/GiveAward.java b/app/src/main/java/ml/docilealligator/infinityforreddit/award/GiveAward.java deleted file mode 100644 index 1b46bb08..00000000 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/award/GiveAward.java +++ /dev/null @@ -1,110 +0,0 @@ -package ml.docilealligator.infinityforreddit.award; - -import android.os.Handler; -import android.text.Html; - -import androidx.annotation.NonNull; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Executor; - -import ml.docilealligator.infinityforreddit.apis.RedditAPI; -import ml.docilealligator.infinityforreddit.utils.APIUtils; -import ml.docilealligator.infinityforreddit.utils.JSONUtils; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; - -public class GiveAward { - public interface GiveAwardListener { - void success(String awardsHTML, int awardCount); - void failed(int code, String message); - } - - public static void giveAwardV2(Executor executor, Handler handler, Retrofit oauthRetrofit, String accessToken, - String thingFullName, String awardId, boolean isAnonymous, - GiveAwardListener giveAwardListener) { - Map<String, String> params = new HashMap<>(); - params.put(APIUtils.GILD_TYPE, awardId); - params.put(APIUtils.IS_ANONYMOUS, Boolean.toString(isAnonymous)); - params.put(APIUtils.THING_ID_KEY, thingFullName); - oauthRetrofit.create(RedditAPI.class).awardThing(APIUtils.getOAuthHeader(accessToken), params).enqueue(new Callback<String>() { - @Override - public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) { - if (response.isSuccessful()) { - executor.execute(() -> parseResponse(handler, response.body(), new ParseResponseAsyncTaskListener() { - @Override - public void success(String awardsHTML, int awardCount) { - giveAwardListener.success(awardsHTML, awardCount); - } - - @Override - public void failed(String errorMessage) { - giveAwardListener.failed(response.code(), response.body()); - } - })); - } else { - giveAwardListener.failed(response.code(), response.body()); - } - } - - @Override - public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) { - giveAwardListener.failed(0, t.getMessage()); - } - }); - } - - private static void parseResponse(Handler handler, String response, ParseResponseAsyncTaskListener parseResponseAsyncTaskListener) { - try { - //Check for error - JSONObject responseObject = new JSONObject(response).getJSONObject(JSONUtils.JSON_KEY); - - if (responseObject.getJSONArray(JSONUtils.ERRORS_KEY).length() != 0) { - JSONArray errorArray = responseObject.getJSONArray(JSONUtils.ERRORS_KEY) - .getJSONArray(responseObject.getJSONArray(JSONUtils.ERRORS_KEY).length() - 1); - if (errorArray.length() != 0) { - String errorString; - if (errorArray.length() >= 2) { - errorString = errorArray.getString(1); - } else { - errorString = errorArray.getString(0); - } - String errorMessage = errorString.substring(0, 1).toUpperCase() + errorString.substring(1); - handler.post(() -> parseResponseAsyncTaskListener.failed(errorMessage)); - } - } - } catch (JSONException ignore) {} - - try { - JSONArray awardingsArray = new JSONObject(response).getJSONArray(JSONUtils.ALL_AWARDINGS_KEY); - StringBuilder awardingsBuilder = new StringBuilder(); - int awardCount = 0; - for (int i = 0; i < awardingsArray.length(); i++) { - JSONObject award = awardingsArray.getJSONObject(i); - int count = award.getInt(JSONUtils.COUNT_KEY); - awardCount += count; - String iconUrl = award.getString(JSONUtils.ICON_URL_KEY); - awardingsBuilder.append("<img src=\"").append(Html.escapeHtml(iconUrl)).append("\"> ").append("x").append(count).append(" "); - } - - String awardsHTML = awardingsBuilder.toString(); - int finalAwardCount = awardCount; - handler.post(() -> parseResponseAsyncTaskListener.success(awardsHTML, finalAwardCount)); - } catch (JSONException e) { - e.printStackTrace(); - handler.post(() -> parseResponseAsyncTaskListener.failed(null)); - } - } - - interface ParseResponseAsyncTaskListener { - void success(String awardsHTML, int awardCount); - void failed(String errorMessage); - } -} diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java index f82e759e..f8ad6cb2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java @@ -21,7 +21,6 @@ import ml.docilealligator.infinityforreddit.activities.BaseActivity; import ml.docilealligator.infinityforreddit.activities.CommentActivity; import ml.docilealligator.infinityforreddit.activities.CommentFilterPreferenceActivity; import ml.docilealligator.infinityforreddit.activities.EditCommentActivity; -import ml.docilealligator.infinityforreddit.activities.GiveAwardActivity; import ml.docilealligator.infinityforreddit.activities.ReportActivity; import ml.docilealligator.infinityforreddit.activities.ViewPostDetailActivity; import ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity; @@ -75,19 +74,6 @@ public class CommentMoreBottomSheetFragment extends LandscapeExpandedRoundedBott boolean showReplyAndSaveOption = bundle.getBoolean(EXTRA_SHOW_REPLY_AND_SAVE_OPTION, false); if (accessToken != null && !accessToken.equals("")) { - binding.giveAwardTextViewCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE); - binding.giveAwardTextViewCommentMoreBottomSheetFragment.setOnClickListener(view -> { - Intent intent = new Intent(activity, GiveAwardActivity.class); - intent.putExtra(GiveAwardActivity.EXTRA_THING_FULLNAME, comment.getFullName()); - intent.putExtra(GiveAwardActivity.EXTRA_ITEM_POSITION, bundle.getInt(EXTRA_POSITION)); - if (activity instanceof ViewPostDetailActivity) { - activity.startActivityForResult(intent, ViewPostDetailActivity.GIVE_AWARD_REQUEST_CODE); - } else if (activity instanceof ViewUserDetailActivity) { - activity.startActivityForResult(intent, ViewUserDetailActivity.GIVE_AWARD_REQUEST_CODE); - } - dismiss(); - }); - if (editAndDeleteAvailable) { binding.editTextViewCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE); binding.deleteTextViewCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java index 1e372602..0a220c6d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java @@ -77,7 +77,6 @@ import ml.docilealligator.infinityforreddit.SaveThing; import ml.docilealligator.infinityforreddit.SortType; import ml.docilealligator.infinityforreddit.activities.CommentActivity; import ml.docilealligator.infinityforreddit.activities.EditPostActivity; -import ml.docilealligator.infinityforreddit.activities.GiveAwardActivity; import ml.docilealligator.infinityforreddit.activities.PostFilterPreferenceActivity; import ml.docilealligator.infinityforreddit.activities.ReportActivity; import ml.docilealligator.infinityforreddit.activities.SubmitCrosspostActivity; @@ -1139,17 +1138,6 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic flairBottomSheetFragment.setArguments(bundle); flairBottomSheetFragment.show(activity.getSupportFragmentManager(), flairBottomSheetFragment.getTag()); return true; - } else if (itemId == R.id.action_give_award_view_post_detail_fragment) { - if (mAccessToken == null) { - Toast.makeText(activity, R.string.login_first, Toast.LENGTH_SHORT).show(); - return true; - } - - Intent giveAwardIntent = new Intent(activity, GiveAwardActivity.class); - giveAwardIntent.putExtra(GiveAwardActivity.EXTRA_THING_FULLNAME, mPost.getFullName()); - giveAwardIntent.putExtra(GiveAwardActivity.EXTRA_ITEM_POSITION, 0); - activity.startActivityForResult(giveAwardIntent, ViewPostDetailActivity.GIVE_AWARD_REQUEST_CODE); - return true; } else if (itemId == R.id.action_report_view_post_detail_fragment) { if (mAccessToken == null) { Toast.makeText(activity, R.string.login_first, Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/res/layout/activity_give_award.xml b/app/src/main/res/layout/activity_give_award.xml deleted file mode 100644 index a67e2927..00000000 --- a/app/src/main/res/layout/activity_give_award.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/coordinator_layout_give_award_activity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".activities.GiveAwardActivity"> - - <com.google.android.material.appbar.AppBarLayout - android:id="@+id/appbar_layout_give_award_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:theme="@style/AppTheme.AppBarOverlay"> - - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_give_award_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - app:title="@string/give_award_activity_label" - app:popupTheme="@style/AppTheme.PopupOverlay" - app:navigationIcon="?attr/homeAsUpIndicator" /> - - </com.google.android.material.appbar.AppBarLayout> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view_give_award_activity" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - -</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_give_award.xml b/app/src/main/res/layout/dialog_give_award.xml deleted file mode 100644 index fa9dfaef..00000000 --- a/app/src/main/res/layout/dialog_give_award.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="24dp" - android:paddingEnd="16dp"> - - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginEnd="16dp" - android:text="@string/anonymous" - android:textColor="?attr/primaryTextColor" /> - - <com.google.android.material.materialswitch.MaterialSwitch - android:id="@+id/switch_material_give_award_dialog" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml index 2ae50a0f..2aedd340 100644 --- a/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml @@ -125,26 +125,6 @@ app:drawableStartCompat="@drawable/ic_copy_24dp" /> <TextView - android:id="@+id/give_award_text_view_comment_more_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackground" - android:clickable="true" - android:drawablePadding="48dp" - android:focusable="true" - android:gravity="center_vertical" - android:paddingStart="32dp" - android:paddingTop="16dp" - android:paddingEnd="32dp" - android:paddingBottom="16dp" - android:text="@string/action_give_award" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:drawableStartCompat="@drawable/ic_give_award_24dp" /> - - <TextView android:id="@+id/report_view_comment_more_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/menu/view_post_detail_fragment.xml b/app/src/main/res/menu/view_post_detail_fragment.xml index 5f732534..e84ad402 100644 --- a/app/src/main/res/menu/view_post_detail_fragment.xml +++ b/app/src/main/res/menu/view_post_detail_fragment.xml @@ -83,33 +83,27 @@ android:visible="false" /> <item - android:id="@+id/action_give_award_view_post_detail_fragment" - android:orderInCategory="13" - android:title="@string/action_give_award" - app:showAsAction="never" /> - - <item android:id="@+id/action_report_view_post_detail_fragment" - android:orderInCategory="14" + android:orderInCategory="13" android:title="@string/action_report" app:showAsAction="never" /> <item android:id="@+id/action_see_removed_view_post_detail_fragment" - android:orderInCategory="15" + android:orderInCategory="14" android:title="@string/action_see_removed" app:showAsAction="never" android:visible="false" /> <item android:id="@+id/action_crosspost_view_post_detail_fragment" - android:orderInCategory="16" + android:orderInCategory="15" android:title="@string/action_crosspost" app:showAsAction="never" /> <item android:id="@+id/action_add_to_post_filter_view_post_detail_fragment" - android:orderInCategory="17" + android:orderInCategory="16" android:title="@string/action_add_to_post_filter" app:showAsAction="never" /> </menu> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e627ba0f..3fe549bf 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -858,14 +858,8 @@ Automatické přehrávání videí je zakázáno."</string> <string name="refresh">"Obnovit"</string> <string name="change_sort_type">"Změnit typ řazení"</string> <string name="change_post_layout">"Změnit rozložení příspěvků"</string> - <string name="give_award_dialog_title">"Dát ocenění?"</string> - <string name="anonymous">"Anonymní"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Kód: %1$d/ -Zpráva: %2$s"</string> - <string name="give_award_success">"Ocenění uděleno"</string> - <string name="give_award_failed">"Selhání"</string> <string name="warning">"Varování"</string> <string name="this_is_a_nsfw_subreddit">"Toto je NSFW subreddit."</string> <string name="this_user_has_nsfw_content">"Tento uživatel má NSFW obsah"</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d536040e..472a58a1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -885,14 +885,8 @@ Automatisches Abspielen von Videos ist deaktiviert."</string> <string name="refresh">"Aktualisieren"</string> <string name="change_sort_type">"Sortiertyp ändern"</string> <string name="change_post_layout">"Beitragslayout ändern"</string> - <string name="give_award_dialog_title">"Auszeichnung verleihen?"</string> - <string name="anonymous">"Anonym"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Code: %1$d/ -Nachricht: %2$s"</string> - <string name="give_award_success">"Auszeichnung verliehen"</string> - <string name="give_award_failed">"Fehlgeschlagen"</string> <string name="warning">"Warnung"</string> <string name="this_is_a_nsfw_subreddit">"Dies ist ein NSFW-Subreddit."</string> <string name="this_user_has_nsfw_content">"Dieser Nutzer hat NSFW-Inhalte"</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 818dc657..591f1c1c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -804,12 +804,6 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="refresh">"Ανανέωση"</string> <string name="change_sort_type">"Αλλαγή τύπου ταξινόμησης"</string> <string name="change_post_layout">"Αλλαγή Διάταξης Ανάρτησης"</string> - <string name="give_award_dialog_title">"Να δωθεί Βραβείο;"</string> - <string name="anonymous">"Ανώνυμος"</string> - <string name="give_award_error_message">"Κωδικός: %1$d/ -Μήνυμα: %2$s"</string> - <string name="give_award_success">"Το βραβείο δόθηκε"</string> - <string name="give_award_failed">"Απέτυχε"</string> <string name="warning">"Προειδοποίηση"</string> <string name="this_is_a_nsfw_subreddit">"Πρόκειται για ένα NSFW subreddit."</string> <string name="this_user_has_nsfw_content">"Αυτός ο χρήστης έχει περιεχόμενο NSFW"</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 68c2e86a..cfd4f103 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -898,18 +898,12 @@ La reproducción automática de video está deshabilitada."</string> <string name="refresh">"Actualizar"</string> <string name="change_sort_type">"Cambiar orden"</string> <string name="change_post_layout">"Cambiar diseño"</string> - <string name="give_award_dialog_title">"¿Premiar?"</string> - <string name="anonymous">"Anónimo"</string> <!-- Código: %1$d/ Mensaje: %2$s https://s3.eu-west-1.amazonaws.com/po-pub/i/hJAe7sMhrfJzqjhp9VkDQOVC.PNG --> <!-- Fuzzy --> - <string name="give_award_error_message">"Código: %1$d/ -Mensaje: %2$s"</string> - <string name="give_award_success">"Premiado"</string> - <string name="give_award_failed">"Falló"</string> <string name="warning">"Precaución"</string> <string name="this_is_a_nsfw_subreddit">"Este es un subreddit NSFW."</string> <string name="this_user_has_nsfw_content">"Este usuario tiene contenido NSFW"</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 02a5419b..32f56c4d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -950,13 +950,8 @@ Les onglets pourraient perdre tout leur contenu quand vous passez d'un onglet à <string name="refresh">"Rafraîchir"</string> <string name="change_sort_type">"Changer l'ordre de tri"</string> <string name="change_post_layout">"Changer la disposition des posts"</string> - <string name="give_award_dialog_title">"Êtes-vous sûr de vouloir récompenser ce post ? "</string> - <string name="anonymous">"Anonyme"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Erreur: %2$s, code: %1$d/"</string> - <string name="give_award_success">"Succès ! "</string> - <string name="give_award_failed">"Échec de la récompense. "</string> <string name="warning">"Avertissement "</string> <string name="this_is_a_nsfw_subreddit">"Cette Subreddit est PSPT (Pas Sécurisé Pour le Travail) "</string> <string name="this_user_has_nsfw_content">"Cet utilisateur poste du contenu NSFW"</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e01c1483..1effb705 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -934,14 +934,8 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="refresh">"ताजा करें "</string> <string name="change_sort_type">"क्रम प्रकार बदलें"</string> <string name="change_post_layout">"पोस्ट विन्यास बदलें "</string> - <string name="give_award_dialog_title">"पुरस्कार दें? "</string> - <string name="anonymous">"अज्ञात"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"कूट: %1$d -संदेश: %2$s"</string> - <string name="give_award_success">"पुरस्कार दे दिया गया "</string> - <string name="give_award_failed">"असफल "</string> <string name="warning">"चेतावनी "</string> <string name="this_is_a_nsfw_subreddit">"यह एक NSFW सबरैडिट है "</string> <string name="this_user_has_nsfw_content">"इस यूजर के पास NSFW सामग्री है। "</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 11e961c8..3be0a824 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -897,14 +897,8 @@ Reddit videi su niže rezolucije."</string> <string name="refresh">"Osvježi"</string> <string name="change_sort_type">"Promijeni tip redosljeda"</string> <string name="change_post_layout">"Promjeni raspored objava"</string> - <string name="give_award_dialog_title">"Nagraditi?"</string> - <string name="anonymous">"Anonimno"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Kod: %1$d/ -Poruka: %2$s"</string> - <string name="give_award_success">"Nagrađeno"</string> - <string name="give_award_failed">"Nagrađivanje nije uspjelo"</string> <string name="warning">"Upozorenje"</string> <string name="this_is_a_nsfw_subreddit">"Ovo je NSFW podreddit."</string> <string name="this_user_has_nsfw_content">"Ovaj korisnik ima NSFW sadržaj"</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a2d5a571..d5c7b9c6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -835,14 +835,8 @@ Videó autómatikus lejátszása le van tiltva."</string> <string name="refresh">"Frissítés"</string> <string name="change_sort_type">"Rendezés típus megváltoztatása"</string> <string name="change_post_layout">"Poszt elrendezése megváltoztatása"</string> - <string name="give_award_dialog_title">"Adsz kitüntetést?"</string> - <string name="anonymous">"Anoním"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Kód: %1$d/ -Üzenet %2$s"</string> - <string name="give_award_success">"Kitüntetés megadva"</string> - <string name="give_award_failed">"Nem sikerült"</string> <string name="warning">"Figyelem"</string> <string name="this_is_a_nsfw_subreddit">"Ez egy NSFW subreddit."</string> <string name="this_user_has_nsfw_content">"Ennek a felhasználónak van NSFW tartlama"</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e275f34f..dc835b90 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -808,12 +808,6 @@ La riproduzione automatica video è disabilitata."</string> <string name="refresh">"Ricarica"</string> <string name="change_sort_type">"Cambia il tipo di ordinamento"</string> <string name="change_post_layout">"Cambia il layout dei post"</string> - <string name="give_award_dialog_title">"Vuoi dare premio?"</string> - <string name="anonymous">"Anonimo"</string> - <string name="give_award_error_message">"Codice: %1$d/ -Messaggio: %2$s"</string> - <string name="give_award_success">"Premio conferito"</string> - <string name="give_award_failed">"Fallito"</string> <string name="warning">"Avvertimento"</string> <string name="this_is_a_nsfw_subreddit">"Questo è un subreddit marcato NSFW."</string> <string name="this_user_has_nsfw_content">"Questo utente è marcato NSFW"</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8953bb22..7748f4fd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -946,14 +946,8 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="refresh">"更新"</string> <string name="change_sort_type">"並べ替えを変更"</string> <string name="change_post_layout">"表示レイアウトを変更"</string> - <string name="give_award_dialog_title">"アワードを贈りますか？"</string> - <string name="anonymous">"匿名"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"コード: %1$d/ -メッセージ: %2$s"</string> - <string name="give_award_success">"アワードを贈りました"</string> - <string name="give_award_failed">"失敗しました"</string> <string name="warning">"警告"</string> <string name="this_is_a_nsfw_subreddit">"このSubredditはNSFWです"</string> <string name="this_user_has_nsfw_content">"このユーザーはNSFWの投稿を含んでいます"</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 94580610..be65b7e3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -871,14 +871,8 @@ Automatisch afspelen van video is uitgeschakeld."</string> <string name="refresh">"Ververs"</string> <string name="change_sort_type">"Wijzig het sorteertype"</string> <string name="change_post_layout">"Wijzig het postlayout"</string> - <string name="give_award_dialog_title">"Geef Award?"</string> - <string name="anonymous">"Anoniem"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Code: %1$d/ -Bericht: %2$s"</string> - <string name="give_award_success">"Award gegeven"</string> - <string name="give_award_failed">"Mislukt"</string> <string name="warning">"Waarschuwing"</string> <string name="this_is_a_nsfw_subreddit">"Dit is een NSFW subreddit."</string> <string name="this_user_has_nsfw_content">"Deze gebruiker heeft NSFW inhoud"</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c91a3468..c100dc22 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -864,14 +864,8 @@ Autoodtwarzanie filmów jest wyłączone."</string> <string name="refresh">"Odśwież"</string> <string name="change_sort_type">"Zmień typ sortowania"</string> <string name="change_post_layout">"Zmień układ postów"</string> - <string name="give_award_dialog_title">"Dać nagrodę?"</string> - <string name="anonymous">"Anonim"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Kod: %1$d/ -Wiadomość: %2$s"</string> - <string name="give_award_success">"Nagroda przyznana"</string> - <string name="give_award_failed">"Niepowodzenie"</string> <string name="warning">"Ostrzeżenie "</string> <string name="this_is_a_nsfw_subreddit">"To jest subreddit NSFW"</string> <string name="this_user_has_nsfw_content">"Ten użytkownik posiada treści NSFW"</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 91287b62..9f0ff829 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -844,14 +844,8 @@ A reprodução automática de vídeos fica desativada."</string> <string name="refresh">"Atualizar"</string> <string name="change_sort_type">"Mudar modo de ordenação"</string> <string name="change_post_layout">"Mudar estrutura da postagem"</string> - <string name="give_award_dialog_title">"Dar prêmio?"</string> - <string name="anonymous">"Anônimo"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Código: %1$,d/ -Mensagem: %2$s"</string> - <string name="give_award_success">"Prêmio concedido"</string> - <string name="give_award_failed">"Falhou"</string> <string name="warning">"Aviso"</string> <string name="this_is_a_nsfw_subreddit">"Este é um subreddit NSFW."</string> <string name="this_user_has_nsfw_content">"Este usuário tem conteúdo NSFW"</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b964bc83..8bcc70b4 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -855,14 +855,8 @@ Reprodução automática de vídeos desativada."</string> <string name="refresh">"Atualizar"</string> <string name="change_sort_type">"Alterar Tipo de Ordenação"</string> <string name="change_post_layout">"Alterar Visualização de Publicações"</string> - <string name="give_award_dialog_title">"Premiar?"</string> - <string name="anonymous">"Anónimo"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Código: %1$d/ -Mensagem: %2$s"</string> - <string name="give_award_success">"Prémio oferecido"</string> - <string name="give_award_failed">"Falhou"</string> <string name="warning">"Aviso"</string> <string name="this_is_a_nsfw_subreddit">"Esta é uma comunidade 18+."</string> <string name="this_user_has_nsfw_content">"Este utilizador tem conteúdo 18+"</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 9b506646..7a4ff4b9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -850,14 +850,8 @@ Redarea automată a videoclipurilor este dezactivată."</string> <string name="refresh">"Reîmprospătează"</string> <string name="change_sort_type">"Schimbă Tipul de Sortare"</string> <string name="change_post_layout">"Schimbă Aspectul Postării"</string> - <string name="give_award_dialog_title">"Acordă un premiu?"</string> - <string name="anonymous">"Anonim"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Cod: %1$d/ -Mesaj: %2$s"</string> - <string name="give_award_success">"Premiu acordat"</string> - <string name="give_award_failed">"A eșuat"</string> <string name="warning">"Avertisment"</string> <string name="this_is_a_nsfw_subreddit">"Acesta este un subreddit NSFW."</string> <string name="this_user_has_nsfw_content">"Acest utilizator are conținut NSFW"</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7297be41..0b1da4d7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -866,14 +866,8 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="refresh">"Обновить"</string> <string name="change_sort_type">"Изменить тип сортировки"</string> <string name="change_post_layout">"Изменить макет поста"</string> - <string name="give_award_dialog_title">"Выдать награду?"</string> - <string name="anonymous">"Аноним"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Код: %1$d/ -Сообщение: %2$s"</string> - <string name="give_award_success">"Награда выдана"</string> - <string name="give_award_failed">"Ошибка"</string> <string name="warning">"Предупреждение"</string> <string name="this_is_a_nsfw_subreddit">"Это NSFW-сабреддит"</string> <string name="this_user_has_nsfw_content">"У пользователь есть NSFW-контент"</string> diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index c79bb571..57ecd524 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -107,7 +107,6 @@ <!-- Fuzzy --> <string name="karma_info_user_detail">"கர்மம்: %1$d (%2$d + %3$d)"</string> - <string name="cakeday_info">"https://crowdin.com/"</string> <string name="profile">"சுயவிவரம்"</string> <string name="subscriptions">"குழுசேர்வுகள்"</string> <string name="multi_reddit">"பல்ரெட்டிட்"</string> @@ -593,10 +592,6 @@ <string name="refresh">"புத்துணர்வூட்டு"</string> <string name="change_sort_type">"வகைப்படுத்தல் வகையை மாற்று"</string> <string name="change_post_layout">"இடுகை தளவமைப்பை மாற்று"</string> - <string name="give_award_dialog_title">"விருதளிக்கவா?"</string> - <string name="anonymous">"அநாமதேய"</string> - <string name="give_award_success">"விருது அளிக்கப்பட்டது"</string> - <string name="give_award_failed">"தோல்வியுற்றது"</string> <string name="warning">"எச்சரிக்கை"</string> <string name="this_is_a_nsfw_subreddit">"இது ஓர் NSFW துணைரெட்டிட்."</string> <string name="this_user_has_nsfw_content">"இப்பயனர் NSFW உள்ளடக்கம் கொண்டுள்ளார்"</string> diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index ec296f29..eaf1e1c4 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -866,14 +866,8 @@ Otomatik video oynatma kapatılır."</string> <string name="refresh">"Yenile"</string> <string name="change_sort_type">"Sıralama Türünü Değiştir"</string> <string name="change_post_layout">"Gönderi Düzenini Değiştir"</string> - <string name="give_award_dialog_title">"Ödül Verilsin mi?"</string> - <string name="anonymous">"Anonim"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Kod: %1$d/ -Mesaj: %2$s"</string> - <string name="give_award_success">"Ödül verildi"</string> - <string name="give_award_failed">"İşlem Başarısız Oldu"</string> <string name="warning">"Uyarı"</string> <string name="this_is_a_nsfw_subreddit">"Bu bir NSFW subredditidir."</string> <string name="this_user_has_nsfw_content">"Bu kullanıcının NSFW içeriği var"</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bc044225..59095b90 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -854,14 +854,8 @@ https://play.google.com/store/apps/details?id=ml.docilealligator.infinityforredd <string name="refresh">"Оновити"</string> <string name="change_sort_type">"Змінити тип сортування"</string> <string name="change_post_layout">"Змінити форму дописів"</string> - <string name="give_award_dialog_title">"Дати нагороду?"</string> - <string name="anonymous">"Анонімно"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Код: %1$d/ -Повідомлення: %2$s"</string> - <string name="give_award_success">"Дано нагороду"</string> - <string name="give_award_failed">"Не вдалося"</string> <string name="warning">"Попередження"</string> <string name="this_is_a_nsfw_subreddit">"Це сабредит НБДР."</string> <string name="this_user_has_nsfw_content">"У цього користувача є вміст НБДР"</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 093a2fc5..64e81263 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -867,14 +867,8 @@ Tự động phát video bị tắt."</string> <string name="refresh">"Làm mới"</string> <string name="change_sort_type">"Thay đổi loại sắp xếp"</string> <string name="change_post_layout">"Thay đổi bố cục bài đăng"</string> - <string name="give_award_dialog_title">"Cho giải thưởng?"</string> - <string name="anonymous">"Vô danh"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"Mã: %1$d/ -Thông báo: %2$s"</string> - <string name="give_award_success">"Giải thưởng đã được cho"</string> - <string name="give_award_failed">"Thất bại"</string> <string name="warning">"Cảnh báo"</string> <string name="this_is_a_nsfw_subreddit">"Đây là một subreddit NSFW."</string> <string name="this_user_has_nsfw_content">"Người dùng này có nội dung NSFW"</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e58e7b7e..7423c537 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -879,14 +879,8 @@ Reddit 视频分辨率较低。 <string name="refresh">"刷新"</string> <string name="change_sort_type">"更改排序类型"</string> <string name="change_post_layout">"更改帖子布局"</string> - <string name="give_award_dialog_title">"给予奖励？"</string> - <string name="anonymous">"匿名"</string> <!-- Fuzzy --> - <string name="give_award_error_message">"错误代码：%1$d/ -错误信息：%2$s"</string> - <string name="give_award_success">"奖励已赠送"</string> - <string name="give_award_failed">"失败"</string> <string name="warning">"警告"</string> <string name="this_is_a_nsfw_subreddit">"这是一个 NSFW 版块。"</string> <string name="this_user_has_nsfw_content">"该用户有 NSFW 内容"</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d0c97909..a918e049 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1091,12 +1091,6 @@ <string name="change_sort_type">Change Sort Type</string> <string name="change_post_layout">Change Post Layout</string> - <string name="give_award_dialog_title">Give Award?</string> - <string name="anonymous">Anonymous</string> - <string name="give_award_error_message">Code: %1$d/\n Message: %2$s</string> - <string name="give_award_success">Award given</string> - <string name="give_award_failed">Failed</string> - <string name="edited">Edited</string> <string name="edited_time">Edited on %s</string> |