🔀 Merge release/1.2.0 into main (gitpanel)

adlerluiz · Oct 21, 2023 · 1f526f2 · 1f526f2
2 parents 7551b0f + 61a7adb
commit 1f526f2
Show file tree

Hide file tree

Showing 19 changed files with 762 additions and 288 deletions.
diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk
@@ -0,0 +1 @@
+C:/Users/adler/fvm/versions/3.3.9
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -0,0 +1,4 @@
+{
+  "flutterSdkVersion": "3.3.9",
+  "flavors": {}
+}
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -34,7 +34,7 @@ if (flutterMinSdkVersion == null) {
 
 def flutterTargetSdkVersion = localProperties.getProperty('flutter.targetSdkVersion')
 if (flutterTargetSdkVersion == null) {
-    flutterTargetSdkVersion = 31
+    flutterTargetSdkVersion = 33
 }
 
 apply plugin: 'com.android.application'

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -35,6 +35,28 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <!-- Deep Link -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="tabnews.com.br" />
+                <data android:host="www.tabnews.com.br" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
+            <!-- App Link -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="tabnews.com.br" />
+                <data android:host="www.tabnews.com.br" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

diff --git a/lib/builder/generate_content.dart b/lib/builder/generate_content.dart
@@ -34,7 +34,9 @@ class GenerateContentBuilder extends StatelessWidget {
           context,
           MaterialPageRoute<dynamic>(
             builder: (context) => ContentViewPage(
-              contentData: contentData,
+              ownerUsername: contentData.ownerUsername!,
+              slug: contentData.slug!,
+              //contentData: contentData,
             ),
           ),
         );

diff --git a/lib/main.dart b/lib/main.dart
@@ -64,9 +64,7 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
           seedColor: Colors.blue,
         ),
       ),
-      home: const HomePage(
-        appName: appName,
-      ),
+      home: const HomePage(),
     );
   }
 }
diff --git a/lib/model/user.dart b/lib/model/user.dart
@@ -2,6 +2,7 @@ class User {
   String? id;
   String? username;
   String? email;
+  String? description;
   bool? notifications;
   List<dynamic>? features;
   int? tabcoins;
@@ -17,6 +18,7 @@ class User {
       : id = json['id'],
         username = json['username'],
         email = json['email'],
+        description = json['description'],
         notifications = json['notifications'],
         features = json['features'],
         tabcoins = json['tabcoins'],
@@ -28,6 +30,7 @@ class User {
         'id': id,
         'username': username,
         'email': email,
+        'description': description,
         'notifications': notifications,
         'features': features,
         'tabcoins': tabcoins,