Merge branch 'l10n_develop' into 'develop'

New Crowdin updates

See merge request tom79/fedilab-tube!63

app/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: "androidx.navigation.safeargs"
 
+
+
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.2"
@@ -9,8 +11,8 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 34
-        versionName "1.11.0"
+        versionCode 37
+        versionName "1.12.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -117,27 +119,27 @@ android {
     sourceSets {
         fdroid_peertube_apps_educ {
             res.srcDirs = ['src/main/res', 'src/acad/res']
-            java.srcDirs = ['src/main/java', 'src/acad/java']
+            java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java']
         }
         google_peertube_apps_educ {
             res.srcDirs = ['src/main/res', 'src/acad/res']
-            java.srcDirs = ['src/main/java', 'src/acad/java']
+            java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java']
         }
         fdroid_full {
             res.srcDirs = ['src/main/res', 'src/full/res']
-            java.srcDirs = ['src/main/java', 'src/full/java']
+            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java']
         }
         google_full {
-            res.srcDirs = ['src/main/res', 'src/full/res']
-            java.srcDirs = ['src/main/java', 'src/full/java']
+            res.srcDirs = ['src/main/res', 'src/full/res', 'src/google_donation/res']
+            java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java']
         }
         queermotion {
             res.srcDirs = ['src/main/res', 'src/queermotion/res']
-            java.srcDirs = ['src/main/java', 'src/full/java']
+            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java']
         }
         bittube {
             res.srcDirs = ['src/main/res', 'src/bittube/res']
-            java.srcDirs = ['src/main/java', 'src/full/java']
+            java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java']
         }
     }
 }
@@ -201,6 +203,8 @@ dependencies {
     implementation 'org.slf4j:slf4j-simple:1.7.30'
 
 
+    google_fullImplementation "com.android.billingclient:billing:3.0.2"
+
     fdroid_peertube_apps_educImplementation 'org.matomo.sdk:tracker:4.1.2'
     google_peertube_apps_educImplementation 'org.matomo.sdk:tracker:4.1.2'
 

app/src/google_donation/java/app/fedilab/fedilabtube/DonationActivity.java

@@ -0,0 +1,278 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.android.billingclient.api.AcknowledgePurchaseParams;
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.BillingClientStateListener;
+import com.android.billingclient.api.BillingResult;
+import com.android.billingclient.api.ConsumeParams;
+import com.android.billingclient.api.ConsumeResponseListener;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.PurchasesUpdatedListener;
+import com.android.billingclient.api.SkuDetailsParams;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.tabs.TabLayout;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import app.fedilab.fedilabtube.databinding.ActivityDonationBinding;
+
+import app.fedilab.fedilabtube.fragment.MySubscriptionDonationsFragment;
+import app.fedilab.fedilabtube.fragment.DonationsFragment;
+
+
+public class DonationActivity extends AppCompatActivity implements PurchasesUpdatedListener {
+
+
+    DonationsFragment donationsFragment;
+    DonationsFragment subscriptionDonationsFragment;
+    MySubscriptionDonationsFragment mySubscriptionDonationsFragment;
+    private ActivityDonationBinding binding;
+    private BillingClient billingClient;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivityDonationBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+        billingClient = BillingClient.newBuilder(this)
+                .setListener(this)
+                .enablePendingPurchases()
+                .build();
+        billingClient.startConnection(new BillingClientStateListener() {
+            @Override
+            public void onBillingSetupFinished(@NotNull BillingResult billingResult) {
+                if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
+                    // The BillingClient is ready. You can query purchases here.
+                    donationsFragment.initialized(billingClient);
+                    subscriptionDonationsFragment.initialized(billingClient);
+
+                    List<Purchase> purchases = queryPurchases();
+                    if (purchases != null) {
+                        for (Purchase purchase : purchases) {
+                            if (!purchase.isAutoRenewing()) {
+                                ConsumeParams consumeParams =
+                                        ConsumeParams.newBuilder()
+                                                .setPurchaseToken(purchase.getPurchaseToken())
+                                                .build();
+
+                                ConsumeResponseListener listener = (billingResult1, purchaseToken) -> {
+                                    //noinspection StatementWithEmptyBody
+                                    if (billingResult1.getResponseCode() == BillingClient.BillingResponseCode.OK) {
+                                        // Handle the success of the consume operation.
+                                    }
+                                };
+                                billingClient.consumeAsync(consumeParams, listener);
+                            }
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void onBillingServiceDisconnected() {
+                // Try to restart the connection on the next request to
+                // Google Play by calling the startConnection() method.
+            }
+        });
+        if (getSupportActionBar() != null)
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        donationsFragment = new DonationsFragment();
+        Bundle bundle1 = new Bundle();
+        bundle1.putSerializable("isSubscriptions", false);
+        donationsFragment.setArguments(bundle1);
+
+
+        subscriptionDonationsFragment = new DonationsFragment();
+        Bundle bundle2 = new Bundle();
+        bundle2.putSerializable("isSubscriptions", true);
+        subscriptionDonationsFragment.setArguments(bundle2);
+
+        mySubscriptionDonationsFragment = new MySubscriptionDonationsFragment();
+
+        binding.tablayout.addTab(binding.tablayout.newTab().setText(getString(R.string.one_time)));
+        binding.tablayout.addTab(binding.tablayout.newTab().setText(getString(R.string.subscriptions)));
+        binding.tablayout.addTab(binding.tablayout.newTab().setText(getString(R.string.my_subscriptions)));
+        binding.viewpager.setOffscreenPageLimit(3);
+
+        PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+        binding.viewpager.setAdapter(mPagerAdapter);
+        binding.viewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                TabLayout.Tab tab = binding.tablayout.getTabAt(position);
+                if (tab != null)
+                    tab.select();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+
+        binding.tablayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.viewpager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+
+    }
+
+    private List<Purchase> queryPurchases() {
+        Purchase.PurchasesResult purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.SUBS);
+        List<Purchase> purchases = purchasesResult.getPurchasesList();
+        List<String> isSubscriptions = new ArrayList<>();
+        HashMap<String, Purchase> map = new HashMap<>();
+        if (purchases != null) {
+            for (Purchase purchase : purchases) {
+                try {
+                    if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
+                        JSONObject purchaseJson = new JSONObject(purchase.getOriginalJson());
+                        String productId = purchaseJson.getString("productId");
+                        isSubscriptions.add(productId);
+                        map.put(productId, purchase);
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+            SkuDetailsParams.Builder paramsSub = SkuDetailsParams.newBuilder();
+            paramsSub.setSkusList(isSubscriptions).setType(BillingClient.SkuType.SUBS);
+            billingClient.querySkuDetailsAsync(paramsSub.build(),
+                    (billingResult2, skuDetailsList) -> mySubscriptionDonationsFragment.initialized(skuDetailsList, map, billingClient));
+        } else {
+            mySubscriptionDonationsFragment.initialized(new ArrayList<>(), map, billingClient);
+        }
+        return purchases;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List<Purchase> purchases) {
+        String message;
+        if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK
+                && purchases != null) {
+            for (Purchase purchase : purchases) {
+                if (!purchase.isAutoRenewing()) {
+                    ConsumeParams consumeParams =
+                            ConsumeParams.newBuilder()
+                                    .setPurchaseToken(purchase.getPurchaseToken())
+                                    .build();
+
+                    ConsumeResponseListener listener = (billingResult1, purchaseToken) -> {
+                    };
+                    billingClient.consumeAsync(consumeParams, listener);
+                } else {
+                    if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
+                        if (!purchase.isAcknowledged()) {
+                            AcknowledgePurchaseParams acknowledgePurchaseParams =
+                                    AcknowledgePurchaseParams.newBuilder()
+                                            .setPurchaseToken(purchase.getPurchaseToken())
+                                            .build();
+                            billingClient.acknowledgePurchase(acknowledgePurchaseParams, b -> {
+                            });
+                        }
+                    }
+
+                    queryPurchases();
+                }
+            }
+            message = getString(R.string.donation_succeeded_null);
+        } else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.USER_CANCELED) {
+            message = getString(R.string.donation_cancelled);
+        } else {
+            message = getString(R.string.toast_error);
+        }
+        View parentLayout = findViewById(android.R.id.content);
+        Snackbar snackbar = Snackbar.make(parentLayout, message, Snackbar.LENGTH_INDEFINITE);
+        snackbar.setAction(R.string.close, view -> snackbar.dismiss());
+        snackbar.show();
+    }
+
+
+    /**
+     * Pager adapter for the 2 fragments
+     */
+    private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+
+        ScreenSlidePagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NotNull
+        @Override
+        public Fragment getItem(int position) {
+            if (position == 0) {
+                return donationsFragment;
+            } else if (position == 1) {
+                return subscriptionDonationsFragment;
+            } else {
+                return mySubscriptionDonationsFragment;
+            }
+        }
+
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+    }
+}

app/src/google_donation/java/app/fedilab/fedilabtube/drawable/DonationButtonAdapter.java

@@ -0,0 +1,91 @@
+package app.fedilab.fedilabtube.drawable;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.BillingFlowParams;
+import com.android.billingclient.api.SkuDetails;
+
+import java.util.List;
+import java.util.Locale;
+
+import app.fedilab.fedilabtube.DonationActivity;
+import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.databinding.DrawerDonationBinding;
+
+
+public class DonationButtonAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private final List<SkuDetails> skuDetails;
+    private final BillingClient billingClient;
+    private Context context;
+    private final boolean isSubscription;
+
+    public DonationButtonAdapter(List<SkuDetails> skuDetails, BillingClient billingClient, boolean subscription) {
+        this.isSubscription = subscription;
+        this.skuDetails = skuDetails;
+        this.billingClient = billingClient;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        DrawerDonationBinding itemBinding = DrawerDonationBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+        return new ViewHolder(itemBinding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
+        final ViewHolder holder = (ViewHolder) viewHolder;
+        SkuDetails skuDetail = skuDetails.get(position);
+        String currency = skuDetail.getPriceCurrencyCode();
+        String price = skuDetail.getPrice();
+        if (isSubscription) {
+            holder.binding.buttonDonation.setText(String.format(Locale.getDefault(), "%s %s / %s", price, currency, context.getString(R.string.month)));
+        } else {
+            holder.binding.buttonDonation.setText(String.format(Locale.getDefault(), "%s %s", price, currency));
+        }
+
+        holder.binding.buttonDonation.setOnClickListener(v -> {
+            BillingFlowParams billingFlowParams = BillingFlowParams.newBuilder()
+                    .setSkuDetails(skuDetail)
+                    .build();
+            billingClient.launchBillingFlow((DonationActivity) context, billingFlowParams);
+        });
+    }
+
+
+    @Override
+    public int getItemCount() {
+        return skuDetails.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        DrawerDonationBinding binding;
+
+        ViewHolder(DrawerDonationBinding itemView) {
+            super(itemView.getRoot());
+            binding = itemView;
+        }
+    }
+}

app/src/google_donation/java/app/fedilab/fedilabtube/drawable/DonationHistoryAdapter.java

@@ -0,0 +1,128 @@
+package app.fedilab.fedilabtube.drawable;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.ConsumeParams;
+import com.android.billingclient.api.ConsumeResponseListener;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.SkuDetails;
+import org.json.JSONException;
+import org.json.JSONObject;
+import java.util.HashMap;
+import java.util.List;
+import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.databinding.DrawerMyDonationBinding;
+import es.dmoral.toasty.Toasty;
+
+
+public class DonationHistoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private final List<SkuDetails> skuDetailsList;
+    private final BillingClient billingClient;
+    private Context context;
+    private final HashMap<String, Purchase> map;
+
+    public DonationHistoryAdapter(List<SkuDetails> SkuDetailsList, HashMap<String, Purchase> map, BillingClient billingClient) {
+        this.skuDetailsList = SkuDetailsList;
+        this.billingClient = billingClient;
+        this.map = map;
+    }
+
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        DrawerMyDonationBinding itemBinding = DrawerMyDonationBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+        return new ViewHolder(itemBinding);
+
+    }
+
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
+        final ViewHolder holder = (ViewHolder) viewHolder;
+        SkuDetails skuDetails = skuDetailsList.get(position);
+        holder.binding.productTitle.setText(skuDetails.getTitle());
+        holder.binding.productName.setText(skuDetails.getDescription());
+        holder.binding.productInfo.setText(skuDetails.getOriginalPrice());
+
+        holder.binding.cancelDonation.setOnClickListener(v -> {
+
+            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
+            dialogBuilder.setMessage(R.string.cancel_subscription_confirm);
+
+            dialogBuilder.setPositiveButton(R.string.cancel_subscription, (dialog, id) -> {
+                JSONObject skudetailsJson;
+                try {
+                    skudetailsJson = new JSONObject(skuDetails.getOriginalJson());
+                    String productId = skudetailsJson.getString("productId");
+                    if (map.containsKey(productId)) {
+                        Purchase purchase = map.get(productId);
+                        if (purchase != null) {
+                            ConsumeParams consumeParams =
+                                    ConsumeParams.newBuilder()
+                                            .setPurchaseToken(purchase.getPurchaseToken())
+                                            .build();
+                            if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
+                                ConsumeResponseListener listener = (billingResult1, purchaseToken) -> {
+                                    if (billingResult1.getResponseCode() == BillingClient.BillingResponseCode.OK) {
+                                        Toasty.success(context, context.getString(R.string.subscription_cancelled), Toasty.LENGTH_LONG).show();
+                                    }
+                                    skuDetailsList.remove(skuDetails);
+                                    notifyDataSetChanged();
+                                };
+                                billingClient.consumeAsync(consumeParams, listener);
+                            }
+
+                        }
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                dialog.dismiss();
+            });
+            dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
+            AlertDialog alertDialogLogoutAccount = dialogBuilder.create();
+            alertDialogLogoutAccount.show();
+        });
+    }
+
+
+    @Override
+    public int getItemCount() {
+        return skuDetailsList.size();
+    }
+
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        DrawerMyDonationBinding binding;
+
+        ViewHolder(DrawerMyDonationBinding itemView) {
+            super(itemView.getRoot());
+            binding = itemView;
+        }
+    }
+
+}

app/src/google_donation/java/app/fedilab/fedilabtube/fragment/DonationsFragment.java

@@ -0,0 +1,112 @@
+package app.fedilab.fedilabtube.fragment;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.SkuDetailsParams;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.databinding.FragmentDonationsBinding;
+import app.fedilab.fedilabtube.drawable.DonationButtonAdapter;
+
+
+public class DonationsFragment extends Fragment {
+
+    public static final String[] donations = {"1", "2", "5", "10"};
+    private FragmentDonationsBinding binding;
+    private View rootView;
+    private Context context;
+    private boolean isSubscriptions;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentDonationsBinding.inflate(LayoutInflater.from(context));
+        rootView = binding.getRoot();
+        context = getContext();
+        Bundle bundle = this.getArguments();
+        if (bundle != null) {
+            isSubscriptions = bundle.getBoolean("isSubscriptions", false);
+        }
+        int donationText;
+        if (isSubscriptions) {
+            donationText = R.string.recurrent_donation_text;
+        } else {
+            donationText = R.string.one_time_donation_text;
+        }
+        binding.donationText.setText(donationText);
+        binding.loader.setVisibility(View.VISIBLE);
+        binding.lvProducts.setVisibility(View.GONE);
+        return rootView;
+    }
+
+    public void initialized(BillingClient bc) {
+
+
+        List<String> donationsList = new ArrayList<>();
+        for (String val : donations) {
+            donationsList.add("tubelab_donation_" + val + (isSubscriptions ? "_s" : ""));
+        }
+        SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
+        if (isSubscriptions) {
+            params.setSkusList(donationsList).setType(BillingClient.SkuType.SUBS);
+        } else {
+            params.setSkusList(donationsList).setType(BillingClient.SkuType.INAPP);
+        }
+        bc.querySkuDetailsAsync(params.build(),
+                (billingResult, skuDetailsList) -> {
+                    binding.loader.setVisibility(View.GONE);
+                    binding.lvProducts.setVisibility(View.VISIBLE);
+                    if (skuDetailsList != null) {
+                        Collections.sort(skuDetailsList, (obj1, obj2) -> obj1.getPrice().compareTo(obj2.getPrice()));
+                    }
+                    DonationButtonAdapter donationButtonAdapter = new DonationButtonAdapter(skuDetailsList, bc, isSubscriptions);
+                    binding.lvProducts.setAdapter(donationButtonAdapter);
+                    binding.lvProducts.setLayoutManager(new LinearLayoutManager(context));
+                });
+
+
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        rootView = null;
+    }
+
+    @Override
+    public void onCreate(Bundle saveInstance) {
+        super.onCreate(saveInstance);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        this.context = context;
+    }
+}

app/src/google_donation/java/app/fedilab/fedilabtube/fragment/MySubscriptionDonationsFragment.java

@@ -0,0 +1,80 @@
+package app.fedilab.fedilabtube.fragment;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.android.billingclient.api.BillingClient;
+import com.android.billingclient.api.Purchase;
+import com.android.billingclient.api.SkuDetails;
+
+import java.util.HashMap;
+import java.util.List;
+
+import app.fedilab.fedilabtube.databinding.FragmentMyDonationsBinding;
+import app.fedilab.fedilabtube.drawable.DonationHistoryAdapter;
+
+public class MySubscriptionDonationsFragment extends Fragment {
+
+    private FragmentMyDonationsBinding binding;
+    private View rootView;
+    private Context context;
+
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentMyDonationsBinding.inflate(LayoutInflater.from(context));
+        rootView = binding.getRoot();
+        context = getContext();
+        binding.loader.setVisibility(View.VISIBLE);
+        binding.lvPurchases.setVisibility(View.GONE);
+        return rootView;
+    }
+
+    public void initialized(List<SkuDetails> skuDetailsList, HashMap<String, Purchase> map, BillingClient bc) {
+        binding.loader.setVisibility(View.GONE);
+        binding.lvPurchases.setVisibility(View.VISIBLE);
+
+        DonationHistoryAdapter donationHistoryAdapter = new DonationHistoryAdapter(skuDetailsList, map, bc);
+        binding.lvPurchases.setAdapter(donationHistoryAdapter);
+        binding.lvPurchases.setLayoutManager(new LinearLayoutManager(context));
+
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        rootView = null;
+    }
+
+    @Override
+    public void onCreate(Bundle saveInstance) {
+        super.onCreate(saveInstance);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        this.context = context;
+    }
+}

app/src/google_donation/res/layout/activity_donation.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2021 Thomas Schneider
+
+    This file is a part of TubeLab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with TubeLab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ShowChannelActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        app:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:expandedTitleMarginEnd="64dp"
+            app:expandedTitleMarginStart="48dp"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tablayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabGravity="fill"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="?colorAccent"
+            app:tabTextColor="@android:color/white" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/google_donation/res/layout/drawer_donation.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <Button
+        android:id="@+id/button_donation"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:paddingStart="40dp"
+        android:paddingTop="15dp"
+        android:paddingEnd="40dp"
+        android:paddingBottom="15dp"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
+

app/src/google_donation/res/layout/drawer_my_donation.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+
+    android:layout_margin="10dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp">
+
+        <TextView
+            android:id="@+id/product_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toStartOf="@+id/cancel_donation"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/product_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintEnd_toStartOf="@+id/cancel_donation"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/product_title" />
+
+        <TextView
+            android:id="@+id/product_info"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintEnd_toStartOf="@+id/cancel_donation"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/product_name" />
+
+        <ImageButton
+            android:id="@+id/cancel_donation"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/cancel"
+            android:src="@drawable/ic_baseline_delete_24"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
+
+

app/src/google_donation/res/layout/fragment_donations.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2021 Thomas Schneider
+
+    This file is a part of TubeLab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with TubeLab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/fab_margin"
+    android:paddingRight="@dimen/fab_margin">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:gravity="center"
+            android:id="@+id/donation_text" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_products"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:divider="@null"
+            android:scrollbars="none" />
+    </LinearLayout>
+
+    <!-- Main Loader -->
+    <RelativeLayout
+        android:id="@+id/loader"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:visibility="gone">
+
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
+    </RelativeLayout>
+</RelativeLayout>
+

app/src/google_donation/res/layout/fragment_my_donations.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2021 Thomas Schneider
+
+    This file is a part of TubeLab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with TubeLab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/fab_margin"
+    android:paddingRight="@dimen/fab_margin">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:gravity="center"
+            android:text="@string/donations_description" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_purchases"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:divider="@null"
+            android:scrollbars="none" />
+    </LinearLayout>
+
+    <!-- Main Loader -->
+    <RelativeLayout
+        android:id="@+id/loader"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:visibility="gone">
+
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
+    </RelativeLayout>
+</RelativeLayout>
+

app/src/google_full/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="app.fedilab.fedilabtube">
 
-
+    <uses-permission android:name="com.android.vending.BILLING" />
     <application
         android:name=".FedilabTube"
         android:allowBackup="false"
@@ -30,5 +30,10 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".DonationActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/support_the_app"
+            android:windowSoftInputMode="stateAlwaysHidden" />
     </application>
 </manifest>

app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java

@@ -19,6 +19,8 @@ import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -52,6 +54,8 @@ import app.fedilab.fedilabtube.helper.SwitchAccountHelper;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 
+import static app.fedilab.fedilabtube.MainActivity.badgeCount;
+
 
 public class AccountActivity extends AppCompatActivity {
 
@@ -112,9 +116,13 @@ public class AccountActivity extends AppCompatActivity {
         });
 
 
-
+        TabLayout.Tab notificationTab = binding.accountTabLayout.newTab();
         if (Helper.isLoggedIn(AccountActivity.this)) {
-            binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.title_notifications)));
+            if (badgeCount > 0) {
+                binding.accountTabLayout.addTab(notificationTab.setText(getString(R.string.title_notifications) + " (" + badgeCount + ")"));
+            } else {
+                binding.accountTabLayout.addTab(notificationTab.setText(getString(R.string.title_notifications)));
+            }
             binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.title_muted)));
             binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.title_channel)));
 
@@ -159,9 +167,29 @@ public class AccountActivity extends AppCompatActivity {
                         fragment = (Fragment) binding.accountViewpager.getAdapter().instantiateItem(binding.accountViewpager, tab.getPosition());
                     switch (tab.getPosition()) {
                         case 0:
-                            if (fragment != null) {
-                                DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment);
-                                displayNotificationsFragment.scrollToTop();
+                            if (badgeCount > 0) {
+                                android.app.AlertDialog.Builder builder;
+                                builder = new android.app.AlertDialog.Builder(AccountActivity.this);
+                                builder.setMessage(R.string.mark_all_notifications_as_read_confirm);
+                                builder.setIcon(android.R.drawable.ic_dialog_alert)
+                                        .setPositiveButton(R.string.mark_all_as_read, (dialog, which) -> {
+                                            new Thread(() -> {
+                                                new RetrofitPeertubeAPI(AccountActivity.this).markAllAsRead();
+                                                Handler mainHandler = new Handler(Looper.getMainLooper());
+                                                badgeCount = 0;
+                                                Runnable myRunnable = () -> binding.accountTabLayout.getTabAt(0).setText(getString(R.string.title_notifications));
+                                                mainHandler.post(myRunnable);
+                                            }).start();
+
+                                            dialog.dismiss();
+                                        })
+                                        .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
+                                        .show();
+                            } else {
+                                if (fragment != null) {
+                                    DisplayNotificationsFragment displayNotificationsFragment = ((DisplayNotificationsFragment) fragment);
+                                    displayNotificationsFragment.scrollToTop();
+                                }
                             }
                             break;
                         case 1:
@@ -195,6 +223,14 @@ public class AccountActivity extends AppCompatActivity {
         }
     }
 
+    public void updateCounter() {
+        if (badgeCount > 0) {
+            binding.accountTabLayout.getTabAt(0).setText(getString(R.string.title_notifications) + " (" + badgeCount + ")");
+        } else {
+            binding.accountTabLayout.getTabAt(0).setText(getString(R.string.title_notifications));
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -210,6 +246,7 @@ public class AccountActivity extends AppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             finish();
+            overridePendingTransition(R.anim.slide_out_up, R.anim.slide_in_up_down);
             return true;
         } else if (item.getItemId() == R.id.action_add_account) {
             SwitchAccountHelper.switchDialog(AccountActivity.this, true);
@@ -255,5 +292,11 @@ public class AccountActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        overridePendingTransition(R.anim.slide_out_up, R.anim.slide_in_up_down);
+    }
+
 
 }

app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java

@@ -175,7 +175,10 @@ public class LoginActivity extends AppCompatActivity {
                 if (!hasFocus) {
                     if (binding.loginInstance.getText() != null) {
                         new Thread(() -> {
-                            String testInstance = binding.loginInstance.getText().toString();
+                            String testInstance = binding.loginInstance.getText().toString().trim();
+                            if (testInstance.length() == 0) {
+                                return;
+                            }
                             WellKnownNodeinfo.NodeInfo instanceNodeInfo = null;
                             if (BuildConfig.allow_remote_connections) {
                                 instanceNodeInfo = new RetrofitPeertubeAPI(LoginActivity.this, testInstance, null).getNodeInfo();

app/src/main/java/app/fedilab/fedilabtube/MainActivity.java

@@ -31,6 +31,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -39,6 +40,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.TooltipCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
@@ -100,7 +102,6 @@ import su.litvak.chromecast.api.v2.MediaStatus;
 
 import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.NORMAL;
 import static app.fedilab.fedilabtube.MainActivity.TypeOfConnection.SURFING;
-import static app.fedilab.fedilabtube.helper.Helper.isLoggedInType;
 import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
 
@@ -118,6 +119,7 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
     private DisplayVideosFragment recentFragment, locaFragment, trendingFragment, subscriptionFragment, mostLikedFragment;
     private DisplayOverviewFragment overviewFragment;
     private ActivityMainBinding binding;
+    public static int badgeCount;
     private final BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = item -> {
         int itemId = item.getItemId();
@@ -354,7 +356,7 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         setSupportActionBar(toolbar);
 
         typeOfConnection = TypeOfConnection.UNKNOWN;
-
+        badgeCount = 0;
 
         binding.navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
 
@@ -392,6 +394,11 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         if (!Helper.isLoggedIn(MainActivity.this)) {
             PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
             binding.viewpager.setAdapter(mPagerAdapter);
+        } else {
+            new Thread(() -> {
+                badgeCount = new RetrofitPeertubeAPI(MainActivity.this).unreadNotifications();
+                invalidateOptionsMenu();
+            }).start();
         }
         binding.viewpager.setOffscreenPageLimit(5);
 
@@ -454,6 +461,7 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
             PlaylistExportHelper.manageIntentUrl(MainActivity.this, getIntent());
         }
 
+
         binding.castClose.setOnClickListener(v -> {
             Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
             Bundle b = new Bundle();
@@ -558,6 +566,12 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        invalidateOptionsMenu();
+    }
+
     private void refreshToken() {
         new Thread(() -> {
             final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -687,7 +701,23 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         MenuItem incognitoItem = menu.findItem(R.id.action_incognito);
         MenuItem instanceItem = menu.findItem(R.id.action_change_instance);
         MenuItem accountItem = menu.findItem(R.id.action_account);
+        MenuItem donateItem = menu.findItem(R.id.action_donate);
 
+        FrameLayout rootView = (FrameLayout) accountItem.getActionView();
+
+        FrameLayout redCircle = rootView.findViewById(R.id.view_alert_red_circle);
+        TextView countTextView = rootView.findViewById(R.id.view_alert_count_textview);
+        //change counter for notifications
+        if (badgeCount > 0) {
+            countTextView.setText(String.valueOf(badgeCount));
+            redCircle.setVisibility(View.VISIBLE);
+        } else {
+            redCircle.setVisibility(View.GONE);
+        }
+        TooltipCompat.setTooltipText(accountItem.getActionView(), getText(R.string.account));
+        if (BuildConfig.full_instances && BuildConfig.google_restriction) {
+            donateItem.setVisible(true);
+        }
 
         if (BuildConfig.surfing_mode && ((Helper.isLoggedIn(MainActivity.this) && typeOfConnection == NORMAL) || typeOfConnection == SURFING)) {
             binding.instances.setVisibility(View.VISIBLE);
@@ -782,6 +812,15 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         }).start();
     }
 
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        final MenuItem accountItem = menu.findItem(R.id.action_account);
+        FrameLayout rootView = (FrameLayout) accountItem.getActionView();
+        rootView.setOnClickListener(v -> onOptionsItemSelected(accountItem));
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         String type = null;
@@ -804,10 +843,13 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
             } else {
                 if (Helper.canMakeAction(MainActivity.this)) {
                     intent = new Intent(MainActivity.this, AccountActivity.class);
+                    startActivity(intent);
+                    overridePendingTransition(R.anim.slide_in_up, R.anim.slide_out_up);
                 } else {
                     intent = new Intent(MainActivity.this, LoginActivity.class);
+                    startActivity(intent);
                 }
-                startActivity(intent);
+
             }
         } else if (item.getItemId() == R.id.action_upload) {
             Intent intent = new Intent(MainActivity.this, PeertubeUploadActivity.class);
@@ -847,6 +889,9 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
         } else if (item.getItemId() == R.id.action_about) {
             Intent intent = new Intent(MainActivity.this, AboutActivity.class);
             startActivity(intent);
+        } else if (item.getItemId() == R.id.action_donate) {
+            Intent intent = new Intent(MainActivity.this, DonationActivity.class);
+            startActivity(intent);
         } else if (item.getItemId() == R.id.action_incognito) {
             item.setChecked(!item.isChecked());
             final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);

app/src/main/java/app/fedilab/fedilabtube/MastodonWebviewConnectActivity.java

@@ -134,6 +134,9 @@ public class MastodonWebviewConnectActivity extends AppCompatActivity {
                         return false;
                     }
                     String code = val[1];
+                    if (code.contains("&")) {
+                        code = code.split("&")[0];
+                    }
                     OauthParams oauthParams = new OauthParams();
                     oauthParams.setClient_id(clientId);
                     oauthParams.setClient_secret(clientSecret);

app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java

@@ -220,6 +220,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private boolean willPlayFromIntent;
     private String chromeCastVideoURL;
     private app.fedilab.fedilabtube.client.mastodon.Status status;
+    Uri captionURI;
+    String captionLang;
 
     public static void hideKeyboard(Activity activity) {
         if (activity != null && activity.getWindow() != null) {
@@ -664,7 +666,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     secInt = Integer.parseInt(sec.replace("s", ""));
                     totalSeconds += secInt;
                 }
-
+                captionURI = null;
+                captionLang = null;
                 if (instance != null && uuid != null) {
                     peertubeInstance = instance.replace("https://", "").replace("http://", "");
                     sepiaSearch = true; // Sepia search flag is used because, at this time we don't know if the video is federated.
@@ -1018,7 +1021,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     secInt = Integer.parseInt(sec.replace("strue", ""));
                     totalSeconds += secInt;
                 }
-
+                captionURI = null;
+                captionLang = null;
                 if (instance != null && uuid != null) {
                     peertubeInstance = instance.replace("https://", "").replace("http://", "");
                     sepiaSearch = true; // Sepia search flag is used because, at this time we don't know if the video is federated.
@@ -1069,6 +1073,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);
         DefaultTimeBar exo_progress = controlView.findViewById(R.id.exo_progress);
         TextView exo_duration = controlView.findViewById(R.id.exo_duration);
+        TextView exo_position = controlView.findViewById(R.id.exo_position);
         TextView exo_live_badge = controlView.findViewById(R.id.exo_live_badge);
         if (peertube.isLive()) {
             exo_progress.setVisibility(View.INVISIBLE);
@@ -1076,9 +1081,11 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             exo_live_badge.setVisibility(View.VISIBLE);
             exo_live_badge.setText(R.string.live);
             exo_live_badge.setBackgroundResource(R.drawable.rounded_live);
+            exo_position.setVisibility(View.GONE);
         } else {
             exo_progress.setVisibility(View.VISIBLE);
             exo_live_badge.setVisibility(View.GONE);
+            exo_position.setVisibility(View.VISIBLE);
             exo_duration.setBackground(null);
         }
 
@@ -1137,6 +1144,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             if (peertube.isLive()) {
                 info_duration.setText(R.string.live);
                 info_duration.setBackgroundResource(R.drawable.rounded_live);
+                info_duration.setBackgroundResource(R.drawable.rounded_live);
             } else {
                 info_duration.setText(Helper.secondsToString(peertube.getDuration()));
             }
@@ -1442,7 +1450,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     e.printStackTrace();
                 }
             }
-            if (video_cache == 0 || dataSourceFactory != null) {
+            if (video_cache == 0 || dataSourceFactory != null || video.isLive()) {
                 if (dataSourceFactory == null) {
                     dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
                             Util.getUserAgent(PeertubeActivity.this, null), null);
@@ -1462,8 +1470,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             } else {
                 CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
                 MediaItem mediaItem = new MediaItem.Builder().setUri(videoURL).build();
-                videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
-                        .createMediaSource(mediaItem);
                 if (subtitles != null) {
                     MediaItem.Subtitle mediaSubtitle = new MediaItem.Subtitle(subtitles, MimeTypes.TEXT_VTT, lang, Format.NO_VALUE);
                     subtitleSource = new SingleSampleMediaSource.Factory(cacheDataSourceFactory).createMediaSource(mediaSubtitle, C.TIME_UNSET);
@@ -1531,7 +1537,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         } else {
             videoURL = peertube.getFileUrl(resolution, PeertubeActivity.this);
         }
-        if (peertube != null && peertube.isWaitTranscoding() && peertube.isLive()) {
+        if (peertube != null && peertube.isLive() && videoURL == null) {
             View parentLayout = findViewById(android.R.id.content);
             Snackbar snackbar = Snackbar.make(parentLayout, R.string.live_not_started, Snackbar.LENGTH_INDEFINITE);
             snackbar.setAction(R.string.close, view -> finish());
@@ -1652,7 +1658,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             public void onReceive(Context context, Intent intent) {
                 String strAction = intent.getAction();
                 if (strAction.equals(Intent.ACTION_SCREEN_OFF)) {
-                    if (player != null && isPlayInMinimized) {
+                    if (player != null) {
                         if (!sharedpreferences.getBoolean(getString(R.string.set_play_screen_lock_choice), false)) {
                             player.setPlayWhenReady(false);
                         } else {
@@ -1939,11 +1945,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     binding.mediaVideo.player(player);
                     binding.doubleTapPlayerView.setPlayer(player);
                     binding.loader.setVisibility(View.GONE);
+
                     startStream(
                             peertube,
                             null,
                             res,
-                            true, position, null, null, false);
+                            true, position, captionURI, captionLang, false);
                 }
                 break;
             case SPEED:
@@ -1955,7 +1962,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 }
                 break;
             case CAPTION:
-                Uri uri = null;
                 Caption captionToUse = null;
                 for (Caption caption : captions) {
                     if (caption.getLanguage().getId().compareTo(item.getStrId()) == 0) {
@@ -1965,10 +1971,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 }
                 if (captionToUse != null) {
                     if (!sepiaSearch) {
-                        uri = Uri.parse("https://" + HelperInstance.getLiveInstance(PeertubeActivity.this) + captionToUse.getCaptionPath());
+                        captionURI = Uri.parse("https://" + HelperInstance.getLiveInstance(PeertubeActivity.this) + captionToUse.getCaptionPath());
                     } else {
-                        uri = Uri.parse("https://" + peertubeInstance + captionToUse.getCaptionPath());
+                        captionURI = Uri.parse("https://" + peertubeInstance + captionToUse.getCaptionPath());
                     }
+                } else {
+                    captionURI = null;
                 }
                 currentCaption = item.getStrId();
                 long newPosition = player.getCurrentPosition();
@@ -1980,14 +1988,15 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 player = new SimpleExoPlayer.Builder(PeertubeActivity.this).setTrackSelector(trackSelector).build();
                 binding.mediaVideo.player(player);
                 binding.doubleTapPlayerView.setPlayer(player);
+                captionLang = item.getStrId();
                 startStream(
                         peertube,
                         null,
                         null,
                         true,
                         newPosition,
-                        uri,
-                        item.getStrId(),
+                        captionURI,
+                        captionLang,
                         false
                 );
                 break;
@@ -2360,16 +2369,16 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             DrawableCompat.setTint(bookmark, color);
         }
 
-        if (status.isReblogged()) {
+        if (reblog != null && status.isReblogged()) {
             reblog.setColorFilter(getResources().getColor(R.color.positive_thumbs), PorterDuff.Mode.SRC_ATOP);
             DrawableCompat.setTint(reblog, getResources().getColor(R.color.positive_thumbs));
         }
-        if (status.isFavourited()) {
+        if (favorite != null && status.isFavourited()) {
             favorite.setColorFilter(getResources().getColor(R.color.favorite), PorterDuff.Mode.SRC_ATOP);
             DrawableCompat.setTint(favorite, getResources().getColor(R.color.favorite));
         }
 
-        if (status.isBookmarked()) {
+        if (bookmark != null && status.isBookmarked()) {
             bookmark.setColorFilter(getResources().getColor(R.color.bookmark), PorterDuff.Mode.SRC_ATOP);
             DrawableCompat.setTint(bookmark, getResources().getColor(R.color.bookmark));
         }

app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java

@@ -284,6 +284,16 @@ public interface PeertubeService {
     @GET("users/me/notifications")
     Call<NotificationData> getNotifications(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("since_id") String sinceId);
 
+    @GET("users/me/notifications?start=0&count=0&unread=true")
+    Call<NotificationData> countNotifications(@Header("Authorization") String credentials);
+
+    @POST("users/me/notifications/read-all")
+    Call<String> markAllAsRead(@Header("Authorization") String credentials);
+
+    @FormUrlEncoded
+    @POST("users/me/notifications/read")
+    Call<String> markAsRead(@Header("Authorization") String credentials, @Field("ids[]") List<String> ids);
+
     //Update Notification settings
     @PUT("users/me/notification-settings")
     Call<String> updateNotifications(@Header("Authorization") String credentials, @Body NotificationSettings notificationSettings);

app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java

@@ -283,6 +283,50 @@ public class RetrofitPeertubeAPI {
     }
 
 
+    /**
+     * Retrieve notifications
+     *
+     * @return APIResponse
+     */
+    public int unreadNotifications() {
+        PeertubeService peertubeService = init();
+        Call<NotificationData> notificationsCall = peertubeService.countNotifications("Bearer " + token);
+        try {
+            Response<NotificationData> response = notificationsCall.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                return response.body().total;
+            }
+        } catch (IOException ignored) {
+        }
+        return 0;
+    }
+
+    /**
+     * Mark all notifications as read
+     */
+    public void markAllAsRead() {
+        PeertubeService peertubeService = init();
+        Call<String> notificationsCall = peertubeService.markAllAsRead("Bearer " + token);
+        try {
+            Response<String> response = notificationsCall.execute();
+        } catch (IOException ignored) {
+        }
+    }
+
+    /**
+     * Mark a notification as read
+     */
+    public void markAsRead(String id) {
+        PeertubeService peertubeService = init();
+        ArrayList<String> ids = new ArrayList<>();
+        ids.add(id);
+        Call<String> notificationsCall = peertubeService.markAsRead("Bearer " + token, ids);
+        try {
+            Response<String> response = notificationsCall.execute();
+        } catch (IOException ignored) {
+        }
+    }
+
     /**
      * Retrieve notifications
      *
@@ -1525,7 +1569,10 @@ public class RetrofitPeertubeAPI {
         }
         try {
             RequestBody displayName = RequestBody.create(playlistParams.getDisplayName(), MediaType.parse("text/plain"));
-            RequestBody description = RequestBody.create(playlistParams.getDescription(), MediaType.parse("text/plain"));
+            RequestBody description = null;
+            if (playlistParams.getDescription() != null) {
+                description = RequestBody.create(playlistParams.getDescription(), MediaType.parse("text/plain"));
+            }
             RequestBody channelId = RequestBody.create(playlistParams.getVideoChannelId(), MediaType.parse("text/plain"));
             if (apiAction == PlaylistsVM.action.CREATE_PLAYLIST) {
                 Call<VideoPlaylistData.VideoPlaylistCreation> stringCall = peertubeService.addPlaylist(getToken(), displayName, description, playlistParams.getPrivacy(), channelId, bodyThumbnail);

app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java

@@ -205,14 +205,19 @@ public class VideoData {
         }
 
         public List<File> getAllFile(Context context) {
-            SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-            int mode = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL);
             if (files != null && files.size() > 0) {
                 return files;
             } else if (streamingPlaylists != null) {
                 List<File> files = new ArrayList<>();
                 for (StreamingPlaylists streamingPlaylists : streamingPlaylists) {
-                    files.addAll(streamingPlaylists.getFiles());
+                    if (streamingPlaylists.getFiles().size() > 0) {
+                        files.addAll(streamingPlaylists.getFiles());
+                    } else {
+                        File file = new File();
+                        file.setFileUrl(streamingPlaylists.getPlaylistUrl());
+                        file.setFileDownloadUrl(streamingPlaylists.getPlaylistUrl());
+                        files.add(file);
+                    }
                 }
                 return files;
             }
@@ -225,9 +230,17 @@ public class VideoData {
                 for (File file : files) {
                     if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
                         if (mode == Helper.VIDEO_MODE_MAGNET) {
-                            return file.getMagnetUri();
+                            if (file.getMagnetUri() != null) {
+                                return file.getMagnetUri();
+                            } else {
+                                return file.getFileUrl();
+                            }
                         } else if (mode == Helper.VIDEO_MODE_TORRENT) {
-                            return file.getTorrentUrl();
+                            if (file.getTorrentUrl() != null) {
+                                return file.getTorrentUrl();
+                            } else {
+                                return file.getFileUrl();
+                            }
                         } else {
                             return file.getFileUrl();
                         }
@@ -237,9 +250,17 @@ public class VideoData {
             File file = Helper.defaultFile(context, files);
             if (file != null) {
                 if (mode == Helper.VIDEO_MODE_MAGNET) {
-                    return file.getMagnetUri();
+                    if (file.getMagnetUri() != null) {
+                        return file.getMagnetUri();
+                    } else {
+                        return file.getFileUrl();
+                    }
                 } else if (mode == Helper.VIDEO_MODE_TORRENT) {
-                    return file.getTorrentUrl();
+                    if (file.getTorrentUrl() != null) {
+                        return file.getTorrentUrl();
+                    } else {
+                        return file.getFileUrl();
+                    }
                 } else {
                     return file.getFileUrl();
                 }

app/src/main/java/app/fedilab/fedilabtube/client/mastodon/MastodonService.java

@@ -28,15 +28,16 @@ import retrofit2.http.Query;
 
 interface MastodonService {
 
+    @FormUrlEncoded
     @POST("apps")
     Call<Oauth> getOauth(
-            @Query("client_name") String client_name,
-            @Query("redirect_uris") String redirect_uris,
-            @Query("scopes") String scopes,
-            @Query("website") String website);
+            @Field("client_name") String client_name,
+            @Field("redirect_uris") String redirect_uris,
+            @Field("scopes") String scopes,
+            @Field("website") String website);
 
     @FormUrlEncoded
-    @POST("/oauth/token")
+    @POST("oauth/token")
     Call<Token> createToken(
             @Field("grant_type") String grant_type,
             @Field("client_id") String client_id,
@@ -53,12 +54,13 @@ interface MastodonService {
             @Query("q") String messageURL
     );
 
+    @FormUrlEncoded
     @POST("statuses")
     Call<Status> postReply(
             @Header("Authorization") String credentials,
-            @Query("in_reply_to_id") String inReplyToId,
-            @Query("status") String content,
-            @Query("visibility") String visibility
+            @Field("in_reply_to_id") String inReplyToId,
+            @Field("status") String content,
+            @Field("visibility") String visibility
     );
 
 

app/src/main/java/app/fedilab/fedilabtube/client/mastodon/RetrofitMastodonAPI.java

@@ -142,6 +142,19 @@ public class RetrofitMastodonAPI {
         }).start();
     }
 
+
+    private MastodonService init_no_api() {
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("https://" + instance)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+        SharedPreferences sharedpreferences = _context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        if (token == null) {
+            token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
+        }
+        return retrofit.create(MastodonService.class);
+    }
+
     private MastodonService init() {
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl(finalUrl)
@@ -223,7 +236,7 @@ public class RetrofitMastodonAPI {
      * @return Account
      */
     public Token manageToken(OauthParams oauthParams) throws Error {
-        MastodonService mastodonService = init();
+        MastodonService mastodonService = init_no_api();
         Call<Token> createToken = mastodonService.createToken(
                 oauthParams.getGrant_type(),
                 oauthParams.getClient_id(),
@@ -274,7 +287,7 @@ public class RetrofitMastodonAPI {
         return null;
     }
 
-    public Status postAction(actionType type, Status status) throws Error {
+    public Status postAction(actionType type, Status status) {
         MastodonService mastodonService = init();
         Call<Status> postAction = null;
         if (status != null) {

app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java

@@ -31,10 +31,12 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
 
+import app.fedilab.fedilabtube.AccountActivity;
 import app.fedilab.fedilabtube.PeertubeActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.ShowAccountActivity;
 import app.fedilab.fedilabtube.ShowChannelActivity;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData;
 import app.fedilab.fedilabtube.client.data.ChannelData;
 import app.fedilab.fedilabtube.client.data.NotificationData.Notification;
@@ -43,6 +45,8 @@ import app.fedilab.fedilabtube.fragment.DisplayNotificationsFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 
+import static app.fedilab.fedilabtube.MainActivity.badgeCount;
+
 
 public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -72,6 +76,11 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
         holder.peertube_notif_pp.setVisibility(View.VISIBLE);
         AccountData.Account accountAction = null;
         ChannelData.Channel channelAction = null;
+        if (notification.isRead()) {
+            holder.unread.setVisibility(View.INVISIBLE);
+        } else {
+            holder.unread.setVisibility(View.VISIBLE);
+        }
         if (notification.getActorFollow() != null) {
             String profileUrl = notification.getActorFollow().getFollower().getAvatar() != null ? notification.getActorFollow().getFollower().getAvatar().getPath() : null;
             Helper.loadGiF(context, profileUrl, holder.peertube_notif_pp);
@@ -93,6 +102,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
             accountAction.setDisplayName(actor.getDisplayName());
             accountAction.setHost(actor.getHost());
             accountAction.setUsername(actor.getName());
+            holder.peertube_notif_message.setOnClickListener(v -> markAsRead(notification, position));
         } else if (notification.getComment() != null) { //Comment Notification
             String profileUrl = notification.getComment().getAccount().getAvatar() != null ? notification.getComment().getAccount().getAvatar().getPath() : null;
             Helper.loadGiF(context, profileUrl, holder.peertube_notif_pp);
@@ -112,6 +122,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
                 b.putString("video_id", notification.getComment().getVideo().getId());
                 b.putString("video_uuid", notification.getComment().getVideo().getUuid());
                 intent.putExtras(b);
+                markAsRead(notification, position);
                 context.startActivity(intent);
             });
         } else {
@@ -155,6 +166,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
                     b.putString("video_uuid", notification.getVideo().getUuid());
                     intent.putExtras(b);
                     context.startActivity(intent);
+                    markAsRead(notification, position);
                 });
             } else if (notification.getVideoAbuse() != null && notification.getVideoAbuse().getVideo() != null) {
                 message = context.getString(R.string.peertube_video_abuse, notification.getVideoAbuse().getVideo().getName());
@@ -163,6 +175,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
                     holder.peertube_notif_message.setText(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
                 else
                     holder.peertube_notif_message.setText(Html.fromHtml(message));
+                holder.peertube_notif_message.setOnClickListener(v -> markAsRead(notification, position));
             } else if (notification.getAbuse() != null) {
                 clickableNotification = false;
                 if (notification.getType() == DisplayNotificationsFragment.MY_VIDEO_REPPORT_SUCCESS) {
@@ -172,6 +185,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
                     holder.peertube_notif_message.setText(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
                 else
                     holder.peertube_notif_message.setText(Html.fromHtml(message));
+                holder.peertube_notif_message.setOnClickListener(v -> markAsRead(notification, position));
             }
         }
         holder.peertube_notif_date.setText(Helper.dateDiff(context, notification.getCreatedAt()));
@@ -197,6 +211,17 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
         }
     }
 
+    private void markAsRead(Notification notification, int position) {
+        if (!notification.isRead()) {
+            notification.setRead(true);
+            badgeCount--;
+            if (context instanceof AccountActivity) {
+                ((AccountActivity) context).updateCounter();
+            }
+            notifyItemChanged(position);
+            new Thread(() -> new RetrofitPeertubeAPI(context).markAsRead(notification.getId())).start();
+        }
+    }
 
     @Override
     public long getItemId(int position) {
@@ -212,7 +237,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
     static class ViewHolder extends RecyclerView.ViewHolder {
 
         ImageView peertube_notif_pp;
-        TextView peertube_notif_message, peertube_notif_date;
+        TextView peertube_notif_message, peertube_notif_date, unread;
         RelativeLayout main_container_trans;
 
         public ViewHolder(View itemView) {
@@ -221,6 +246,8 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter<Recyc
             peertube_notif_message = itemView.findViewById(R.id.peertube_notif_message);
             peertube_notif_date = itemView.findViewById(R.id.peertube_notif_date);
             main_container_trans = itemView.findViewById(R.id.container_trans);
+            unread = itemView.findViewById(R.id.unread);
+
         }
 
         public View getView() {

app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java

@@ -691,4 +691,6 @@ public class Helper {
             return String.format(Locale.getDefault(), "%s%s", df.format(rounded), context.getString(R.string.b));
         }
     }
+
+
 }

app/src/main/java/app/fedilab/fedilabtube/viewmodel/mastodon/MastodonPostActionsVM.java

@@ -107,7 +107,7 @@ public class MastodonPostActionsVM extends AndroidViewModel {
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> statusMutableLiveData.setValue(statusReply);
                 mainHandler.post(myRunnable);
-            } catch (Exception | Error e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }).start();

app/src/main/res/drawable/circle_red.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/holo_red_dark" />
+    <size
+        android:width="10dp"
+        android:height="10dp" />
+</shape>

app/src/main/res/drawable/ic_baseline_attach_money_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z" />
+</vector>

app/src/main/res/drawable/ic_baseline_fiber_new_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorAccent"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,4H4C2.89,4 2.01,4.89 2.01,6L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6C22,4.89 21.11,4 20,4zM8.5,15H7.3l-2.55,-3.5V15H3.5V9h1.25l2.5,3.5V9H8.5V15zM13.5,10.26H11v1.12h2.5v1.26H11v1.11h2.5V15h-4V9h4V10.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1V9h1.25v4.51h1.13V9.99h1.25v3.51h1.12V9h1.25V14z" />
+</vector>

app/src/main/res/layout/activity_account.xml

@@ -46,7 +46,7 @@
                     android:id="@+id/instance"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="5dp"
                     android:gravity="center"
                     android:textColor="@android:color/white"
                     android:textSize="18sp"

app/src/main/res/layout/counter_account_icon.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="32dp"
+    android:layout_height="32dp"
+    android:layout_gravity="center">
+
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/account"
+        android:src="@drawable/ic_outline_account_circle_24" />
+
+    <FrameLayout
+        android:id="@+id/view_alert_red_circle"
+        android:layout_width="14dp"
+        android:layout_height="14dp"
+        android:layout_gravity="top|end"
+        android:background="@drawable/circle_red"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/view_alert_count_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            tools:text="3" />
+
+    </FrameLayout>
+
+</FrameLayout>

app/src/main/res/layout/drawer_peertube_notification.xml

@@ -15,6 +15,7 @@
     see <http://www.gnu.org/licenses>.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -38,13 +39,27 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/peertube_notif_date"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:gravity="end"
-                android:textAlignment="viewEnd" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/unread"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:visibility="invisible"
+                    app:drawableStartCompat="@drawable/ic_baseline_fiber_new_24" />
+
+                <TextView
+                    android:id="@+id/peertube_notif_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="end"
+                    android:textAlignment="viewEnd" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/peertube_notif_message"

app/src/main/res/menu/main_menu.xml

@@ -15,16 +15,16 @@
         android:title="@string/change_instance"
         android:visible="false"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_account"
+        app:actionLayout="@layout/counter_account_icon"
+        android:title="@string/account"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_playlist"
         android:icon="@drawable/ic_baseline_playlist_play_24"
         android:title="@string/playlists"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/action_account"
-        android:icon="@drawable/ic_outline_account_circle_24"
-        android:title="@string/account"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_upload"
         android:icon="@drawable/ic_baseline_cloud_upload_24"
@@ -67,4 +67,10 @@
         android:icon="@drawable/ic_baseline_info_24"
         android:title="@string/about_the_app"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_donate"
+        android:icon="@drawable/ic_baseline_attach_money_24"
+        android:title="@string/make_a_donation"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
 </menu>

app/src/main/res/values-ar/strings.xml

@@ -361,4 +361,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -357,4 +357,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-el/strings.xml

@@ -356,4 +356,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -357,4 +357,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -357,4 +357,22 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
+    <string name="mark_all_notifications_as_read_confirm">Are you sure you want to mark all notifications as read?</string>
+    <string name="mark_all_as_read">Mark all as read</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -357,4 +357,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -356,4 +356,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -356,4 +356,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -357,4 +357,20 @@
     <string name="watermark">Watermerk</string>
     <string name="toast_code_error">Er is een fout opgetreden! De instantie gaf geen autorisatiecode terug!</string>
     <string name="remote_account_from"><b>%1$s</b> extern account verbonden met de app.\n\nU kunt doorgaan naar bepaalde acties.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -359,4 +359,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -357,4 +357,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -358,4 +358,22 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
+    <string name="mark_all_notifications_as_read_confirm">Are you sure you want to mark all notifications as read?</string>
+    <string name="mark_all_as_read">Mark all as read</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -359,4 +359,20 @@
     <string name="watermark">Водяной знак</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -357,4 +357,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -355,4 +355,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -356,4 +356,20 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -455,5 +455,23 @@
     <string name="watermark">Watermark</string>
     <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
     <string name="remote_account_from"><b>%1$s</b> remote account connected with the app.\n\nYou can proceed to some limited actions.</string>
+    <string name="donate">Donate</string>
+    <string name="my_donations">My donations</string>
+    <string name="one_time_donation_text">Here, you can make a one time donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="recurrent_donation_text">Here, you can make a recurrent donation for supporting the development of the app. This action will not bring extra features!</string>
+    <string name="make_a_donation">Make a donation</string>
+    <string name="donations_description">Here you will find the list of your recurrent  donations made to support the development of the app! Thank you!</string>
+    <string name="support_the_app">Support the app</string>
+    <string name="donation_cancelled">Donation has been cancelled!</string>
+    <string name="donation_succeeded_null">Thank you for your donation!</string>
+    <string name="donation_succeeded">Thank you for your donation of %1$s!</string>
+    <string name="one_time">One time</string>
+    <string name="my_subscriptions">My subscription</string>
+    <string name="month">Month</string>
+    <string name="subscription_cancelled">Subscription cancelled!</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="cancel_subscription_confirm">Are you sure, you want to cancel that subscription?</string>
+    <string name="mark_all_notifications_as_read_confirm">Are you sure you want to mark all notifications as read?</string>
+    <string name="mark_all_as_read">Mark all as read</string>
 
 </resources>

app/src/no_google_donation/java/app/fedilab/fedilabtube/DonationActivity.java

@@ -0,0 +1,20 @@
+package app.fedilab.fedilabtube;
+/* Copyright 2021 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+//Do nothing
+public class DonationActivity {
+
+}

src/fdroid_full/fastlane/metadata/android/en-US/changelogs/36.txt

@@ -0,0 +1,15 @@
+Added:
+- Notification counter
+- Mark all notifications as read
+- Google: donations via Google Billing
+
+Changed:
+- Improve layout for lives
+- Move the account item
+
+Fixed:
+- Cannot connect Pleroma/Mastodon accounts
+- Issue with captions when changing the resolution
+- Keep playing when screen is off
+- Creating a Playlist without description crashes
+- Live not starting issue

src/fdroid_full/fastlane/metadata/android/en-US/changelogs/37.txt

@@ -0,0 +1,16 @@
+Added:
+- Notification counter
+- Mark all notifications as read
+- Google: donations via Google Billing
+
+Changed:
+- Improve layout for lives
+- Move the account item
+
+Fixed:
+- Cannot connect Pleroma/Mastodon accounts
+- Cannot comment/reply with Pleroma accounts
+- Issue with captions when changing the resolution
+- Keep playing when screen is off
+- Creating a Playlist without description crashes
+- Live not starting issue

torrentStream/build.gradle

@@ -20,6 +20,7 @@ apply plugin: 'de.undercouch.download'
 
 group='com.github.TorrentStream'
 
+
 android {
     compileSdkVersion 30