Add flexbox layout for wrapping

* Save filter selection
* Handle ini comments in key reader

app/build.gradle

@@ -100,6 +100,7 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.2.5'
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
+    implementation 'com.google.android:flexbox:2.0.1'
 
     /* Kotlin */
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

app/src/main/java/emu/skyline/AppDialog.kt

@@ -48,9 +48,7 @@ class AppDialog : BottomSheetDialogFragment() {
     /**
      * This inflates the layout of the dialog after initial view creation
      */
-    override fun onCreateView(inflater : LayoutInflater, container : ViewGroup?, savedInstanceState : Bundle?) : View? {
+    override fun onCreateView(inflater : LayoutInflater, container : ViewGroup?, savedInstanceState : Bundle?) = AppDialogBinding.inflate(inflater).also { binding = it }.root
-        return AppDialogBinding.inflate(inflater).also { binding = it }.root
-    }
 
     /**
      * This expands the bottom sheet so that it's fully visible and map the B button to back

app/src/main/java/emu/skyline/KeyReader.kt

@@ -31,16 +31,14 @@ object KeyReader {
         if (!DocumentFile.isDocumentUri(context, uri))
             return false
 
-        val fileName = DocumentFile.fromSingleUri(context, uri)!!.name
-        if (fileName?.substringAfterLast('.')?.startsWith("keys")?.not() == true)
-            return false
-
         val tmpOutputFile = File("${context.filesDir.canonicalFile}/${keyType.fileName}.tmp")
 
         val inputStream = context.contentResolver.openInputStream(uri)
         tmpOutputFile.bufferedWriter().use { writer ->
             val valid = inputStream!!.bufferedReader().useLines {
                 for (line in it) {
+                    if (line.startsWith(";")) continue
+
                     val pair = line.split("=")
                     if (pair.size != 2)
                         return@useLines false

app/src/main/java/emu/skyline/MainActivity.kt

@@ -108,12 +108,14 @@ class MainActivity : AppCompatActivity() {
         binding.chipGroup.setOnCheckedChangeListener { group, checkedId ->
             for (i in 0 until group.childCount) {
                 if (group.getChildAt(i).id == checkedId) {
+                    settings.filter = i
                     formatFilter = if (i == 0) null else formatOrder[i - 1]
                     populateAdapter()
                     break
                 }
             }
         }
+        binding.chipGroup.check(binding.chipGroup.getChildAt(settings.filter).id)
 
         viewModel.stateData.observe(owner = this, onChanged = ::handleState)
         loadRoms(!settings.refreshRequired)

app/src/main/java/emu/skyline/utils/Settings.kt

@@ -33,4 +33,6 @@ class Settings @Inject constructor(@ApplicationContext private val context : Con
     var logCompact by sharedPreferences(context, false)
 
     var logLevel by sharedPreferences(context, "3")
+
+    var filter by sharedPreferences(context, 0)
 }

app/src/main/java/emu/skyline/utils/SharedPreferencesDelegate.kt

@@ -22,7 +22,8 @@ class SharedPreferencesDelegate<T>(context : Context, private val clazz : Class<
                 Float::class.java, java.lang.Float::class.java -> putFloat(keyName, value as Float)
                 Boolean::class.java, java.lang.Boolean::class.java -> putBoolean(keyName, value as Boolean)
                 String::class.java, java.lang.String::class.java -> putString(keyName, value as String)
-                else -> error("Unsupported type $clazz ${Float::class.java}")
+                Int::class.java, java.lang.Integer::class.java -> putInt(keyName, value as Int)
+                else -> error("Unsupported type $clazz")
             }
         }.apply()
     }
@@ -34,6 +35,7 @@ class SharedPreferencesDelegate<T>(context : Context, private val clazz : Class<
                 Float::class.java, java.lang.Float::class.java -> it.getFloat(keyName, default as Float)
                 Boolean::class.java, java.lang.Boolean::class.java -> it.getBoolean(keyName, default as Boolean)
                 String::class.java, java.lang.String::class.java -> it.getString(keyName, default as String)
+                Int::class.java, java.lang.Integer::class.java -> it.getInt(keyName, default as Int)
                 else -> error("Unsupported type $clazz")
             }
         } as T

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

@@ -40,13 +40,12 @@
             android:textSize="14sp"
             tools:text="Subtitle" />
 
-        <LinearLayout
+        <com.google.android.flexbox.FlexboxLayout
-                android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="8dp"
-                android:orientation="horizontal">
+            app:flexWrap="wrap">
 
             <Button
                 android:id="@+id/game_play"
@@ -68,6 +67,6 @@
                 android:layout_marginStart="6dp"
                 android:text="@string/pin"
                 android:textColor="?attr/colorAccent" />
-        </LinearLayout>
+        </com.google.android.flexbox.FlexboxLayout>
     </LinearLayout>
 </LinearLayout>

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

@@ -122,7 +122,7 @@
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="-4dp"
+        android:layout_marginTop="-8dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
@@ -139,9 +139,10 @@
                     android:id="@+id/chip_group"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="18dp"
+                    android:paddingStart="18dp"
-                    android:layout_marginTop="16dp"
+                    android:paddingTop="16dp"
-                    android:layout_marginEnd="18dp"
+                    android:paddingEnd="18dp"
+                    android:paddingBottom="4dp"
                     app:checkedChip="@id/all_chip"
                     app:chipSpacingHorizontal="16dp"
                     app:selectionRequired="true"
@@ -161,8 +162,7 @@
                 android:id="@+id/app_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:clipToPadding="false"
+                android:clipToPadding="false" />
-                android:paddingTop="4dp" />
         </LinearLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>