diff --git a/README.md b/README.md
index 2472b01..763c37c 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,66 @@
-# Flutter samples
+# Stream Flutter Samples

-**Quick Links**
+## 😎 Repo Overview
-- [Register](https://getstream.io/chat/trial/) to get an API key for Stream Chat
+This repo contains official Stream projects, guides, links to helpful resources, and excellent tutorials and samples developed by the Flutter community.
+
+#### Quick Links
+
+- [Register For a Free Account](https://getstream.io/try-for-free/)
+- [Stream Flutter YouTube Playlist](https://www.youtube.com/playlist?list=PLNBhvhkAJG6t-BxkRAnSqa67lm5C1mpKk)
+
+**Chat:**
- [Flutter Chat Tutorial](https://getstream.io/chat/flutter/tutorial/)
+- [Flutter Chat SDK Repo](https://github.com/GetStream/stream-chat-flutter)
+- [Flutter Chat Client Documentation](https://getstream.io/chat/docs/flutter-dart/?language=dart)
+- [Flutter Chat UI Documentation and Helpful Guides](https://getstream.io/chat/docs/sdk/flutter/)
- [Chat UI Kit](https://getstream.io/chat/ui-kit/)
-- [Flutter SDK Repo](https://github.com/GetStream/stream-chat-flutter)
+**Feeds:**
+- [Flutter Feed Tutorial](https://getstream.io/activity-feeds/sdk/flutter/tutorial/)
+- [Flutter Feed SDK Repo](https://github.com/GetStream/stream-feed-flutter)
+- [Flutter Feed Client Documentation](https://getstream.io/activity-feeds/docs/flutter-dart/?language=dart)
+
+
+
+🔎 Official Samples and Tutorials
+------------
+
+| 🔮 Official Samples | |
+|:-----|---------|
+|
|
+| ⚙️ Tutorials | |
+|
|
+|
|
+| ⚙️ Codelabs | |
+|
|
+| | |
+
+## Chat Guides
+See [here](https://getstream.io/chat/docs/sdk/flutter/) for all our chat guides.
+
+These guides explore our UI components in greater detail and demonstrate how to easily perform a variety of common actions using the Stream Chat Flutter SDK, such as:
+- [Adding Push Notifications](https://getstream.io/chat/docs/sdk/flutter/guides/adding_push_notifications_v2/)
+- [Adding Localization](https://getstream.io/chat/docs/sdk/flutter/guides/adding_localization/)
+- [Adding Custom Attachments - Location Sharing](https://getstream.io/chat/docs/sdk/flutter/guides/adding_custom_attachments/)
+- [Token Generation With Firebase Auth and Cloud Functions](https://getstream.io/chat/docs/sdk/flutter/guides/token_generation_with_firebase/)
+- [Adding Chat To Video Livestreams](https://getstream.io/chat/docs/sdk/flutter/guides/adding_chat_to_video_livestreams/)
+- [Adding Local Data Persistence](https://getstream.io/chat/docs/sdk/flutter/guides/adding_local_data_persistence/)
+- [Understanding Filters](https://getstream.io/chat/docs/sdk/flutter/guides/understanding_filters/)
+- [End To End Chat Encryption](https://getstream.io/chat/docs/sdk/flutter/guides/end_to_end_chat_encryption/)
+
+## Chat Tutorials
+Chat tutorials that go into greater detail on certain topics:
+- [Add Peer-to-Peer Payment Integration With Stream and Rapyd](https://getstream.io/blog/p2p-integration-with-flutter/)
+- [Send Voice Messages](https://getstream.io/blog/instantly-send-audio-messages-with-stream-chat-and-flutter/)
+- [Location Sharing](https://getstream.io/blog/add-location-sharing-to-a-messaging-app-using-flutter/)
## What is Stream?
-Stream allows developers to rapidly deploy scalable feeds and chat messaging with an industry leading 99.999% uptime SLA guarantee.
+Stream allows developers to rapidly deploy scalable feeds and chat messaging with an industry-leading 99.999% uptime SLA guarantee.
With Stream's chat components, developers quickly add chat to their app for a variety of use-cases:
@@ -22,28 +70,17 @@ With Stream's chat components, developers quickly add chat to their app for a va
- Messaging style chat like Whatsapp or Facebook's messenger
- Commerce chat like Drift or Intercom
-## Repo Overview 😎
-
-This repo contains projects and samples developed by the team and Stream community. Projects are broke up into directories under the `packages` folder.
-
-Each project contains a README with build and execution instructions.
-
-## **Maintained Projects 🚀**
-- [Stream Chat v1](https://github.com/GetStream/flutter-samples/tree/main/packages/stream_chat_v1): a sample app implemented using Stream Chat and Flutter. It is a fully fledged messaging app built using a combination of our pre-made widgets and custom Flutter widgets.
-- [Chatter YouTube Series](https://github.com/HayesGordon/chatter): an ongoing, beginner friendly, YouTube video series showing how to use Stream's Flutter packages.
-- [iMessage clone](https://github.com/GetStream/flutter-samples/tree/main/packages/imessage): an iMessage clone implemented using Flutter and the `stream_chat_flutter_core` package.
-
-## **Historic Projects 📕**
+## 📕 Historic Projects
*These projects are not actively maintained. They were developed using older versions of our packages and Flutter.*
- [Stream Chatty](https://github.com/GetStream/flutter-samples/tree/main/packages/chatty) Stream Chatty is a sample chat app made in Flutter using Stream Chat, Firebase, and flutter_bloc. It has full light and dark mode support, real-time chat, and full authentication using Firebase auth.
-## Requirements 🛠
+## 🛠 Requirements
-Before running this project please ensure Flutter is installed and configured on your machine. If you're new to Flutter, please checkout the [official guide](https://flutter.dev/docs/get-started/install) with installation instructions for your OS.
+Before running this project, please ensure Flutter is installed and configured on your machine. If you're new to Flutter, please check out the [official guide](https://flutter.dev/docs/get-started/install) with installation instructions for your OS.
-## Contributing
+## 📈 Contributing
- How can I submit a sample app?
- - Apps submissions are always welcomed! 🥳 Open a pr with a proper description and we'll review it as soon as possible
-- Spot a bug 🕷 ?
- - We welcome code changes that improve the apps or fix a problem. Please make sure to follow all best practices and add tests if applicable before submitting a Pull Request on Github.
+ - Apps submissions are always welcomed! 🥳 Open a pr with a proper description, and we'll review it as soon as possible
+- Spot a bug 🕷?
+ - We welcome code changes that improve the apps or fix a problem. Please follow all best practices and add tests if applicable before submitting a Pull Request on Github.
diff --git a/packages/stream_chat_v1/android/app/build.gradle b/packages/stream_chat_v1/android/app/build.gradle
index 147d607..189df97 100644
--- a/packages/stream_chat_v1/android/app/build.gradle
+++ b/packages/stream_chat_v1/android/app/build.gradle
@@ -40,7 +40,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.example"
- minSdkVersion 21
+ minSdkVersion 22
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
diff --git a/packages/stream_chat_v1/lib/advanced_options_page.dart b/packages/stream_chat_v1/lib/advanced_options_page.dart
index 2645e19..f442453 100644
--- a/packages/stream_chat_v1/lib/advanced_options_page.dart
+++ b/packages/stream_chat_v1/lib/advanced_options_page.dart
@@ -293,10 +293,7 @@ class _AdvancedOptionsPageState extends State