Fixed null settings file issue & determine emote height by aspect ratio

README.md

@@ -6,7 +6,7 @@
 </p>
 
 <h4 align="center">
-Search and discover BTTV emotes to add to your keyboard stickers and use them anywhere
+Search, discover and use BTTV emotes in any messaging apps using stickers
 </h4>
 
 ## Features

android/app/build.gradle

@@ -86,5 +86,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     kapt 'com.github.bumptech.glide:compiler:4.12.0'
 }

android/app/src/main/res/layout/emote.xml

@@ -11,13 +11,20 @@
     app:cardUseCompatPadding="true"
     app:contentPadding="8dp">
 
-    <ImageView
-        android:id="@+id/EmoteImage"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="75dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:background="#ff464649"
-        android:cropToPadding="true"
-        android:scaleType="fitCenter" />
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/EmoteImage"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="#ff464649"
+            android:cropToPadding="true"
+            android:scaleType="fitCenter"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>

android/app/src/main/res/layout/keyboard.xml

@@ -10,8 +10,6 @@
         android:id="@+id/EmoteList"
         android:layout_width="match_parent"
         android:layout_height="250dp"
-        android:horizontalSpacing="-5dp"
         android:numColumns="4"
-        android:stretchMode="columnWidth"
-        android:verticalSpacing="-5dp" />
+        android:stretchMode="columnWidth" />
 </RelativeLayout>

lib/models/pack.dart

@@ -54,9 +54,10 @@ class Pack extends ChangeNotifier implements JsonSerializable {
 
   fromJson(Future<Map<String, dynamic>> futureJson) async {
     var json = await futureJson;
-    _added = ((json['emotes'] ?? []) as List)
-        .map((item) => Emote.fromJson(item))
-        .toList();
+    List<dynamic>? emotes = json['emotes'];
+    if (emotes != null) {
+      _added = emotes.map((item) => Emote.fromJson(item)).toList();
+    }
     notifyListeners();
   }
 

lib/models/settings.dart

@@ -21,8 +21,10 @@ class Settings extends ChangeNotifier implements JsonSerializable {
 
   fromJson(Future<Map<String, dynamic>> futureJson) async {
     var json = await futureJson;
-    _theme =
-        enumFromString(ThemeMode.values, json['theme']) ?? ThemeMode.system;
+    String? theme = json['theme'];
+    if (theme != null) {
+      _theme = enumFromString(ThemeMode.values, theme) ?? ThemeMode.system;
+    }
     notifyListeners();
   }
 

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.0.0+5
+version: 2.0.1+6
 
 environment:
   sdk: ">=2.12.0 <3.0.0"