diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2b42c7..2f3f481 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,10 @@
tools:ignore="LockedOrientationActivity">
+
\ No newline at end of file
diff --git a/app/src/main/java/com/illusionware/npsbrowser/AppData.kt b/app/src/main/java/com/illusionware/npsbrowser/AppData.kt
index 97fd7fe..a35dcf7 100644
--- a/app/src/main/java/com/illusionware/npsbrowser/AppData.kt
+++ b/app/src/main/java/com/illusionware/npsbrowser/AppData.kt
@@ -1,5 +1,5 @@
package com.illusionware.npsbrowser
-data class AppData(val TitleID: String?, val Region: String?, val Title : String?, val link : String?,
+data class AppData(val titleID: String?, val region: String?, val title : String?, val link : String?,
val license : String?, val contentID : String?, val lastDateTime: String?,
- val fileSize : Number?, val SHA256 : String?, val minFW : String?)
\ No newline at end of file
+ val fileSize : Number?, val sha256 : String?, val minFW : String?)
\ No newline at end of file
diff --git a/app/src/main/java/com/illusionware/npsbrowser/activities/AppsListActivity.kt b/app/src/main/java/com/illusionware/npsbrowser/activities/AppsListActivity.kt
index 2d83943..2c48c2e 100644
--- a/app/src/main/java/com/illusionware/npsbrowser/activities/AppsListActivity.kt
+++ b/app/src/main/java/com/illusionware/npsbrowser/activities/AppsListActivity.kt
@@ -21,10 +21,10 @@ class AppsListActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- val binding = ActivityAppsListBinding.inflate(layoutInflater);
+ val binding = ActivityAppsListBinding.inflate(layoutInflater)
setContentView(binding.root)
- viewAdapter = AppAdapter(apps)
+ viewAdapter = AppAdapter(apps, applicationContext)
recyclerView = binding.appsRecycler
recyclerView.apply {
diff --git a/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt b/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt
index 2f2d97a..69be772 100644
--- a/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt
+++ b/app/src/main/java/com/illusionware/npsbrowser/activities/MainActivity.kt
@@ -86,7 +86,7 @@ class MainActivity : AppCompatActivity() {
fileSize ?: 0, sha256 ?: "MISSING", minFW)
apps.add(app)
}
- apps.sortBy { it.Title }
+ apps.sortBy { it.title }
AppsListActivity.apps = apps
startActivity(myIntent)
}
diff --git a/app/src/main/java/com/illusionware/npsbrowser/activities/SingleAppActivity.kt b/app/src/main/java/com/illusionware/npsbrowser/activities/SingleAppActivity.kt
index 069fbf3..6d4b2fd 100644
--- a/app/src/main/java/com/illusionware/npsbrowser/activities/SingleAppActivity.kt
+++ b/app/src/main/java/com/illusionware/npsbrowser/activities/SingleAppActivity.kt
@@ -11,10 +11,10 @@ class SingleAppActivity: AppCompatActivity() {
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- val binding = ActivitySingleAppBinding.inflate(layoutInflater);
+ val binding = ActivitySingleAppBinding.inflate(layoutInflater)
setContentView(binding.root)
- binding.titleID.text = app.TitleID
- binding.gameTitle.text = app.Title;
+ binding.titleID.text = app.titleID
+ binding.gameTitle.text = app.title
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt b/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt
index f7b1e63..db4af23 100644
--- a/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt
+++ b/app/src/main/java/com/illusionware/npsbrowser/adapters/AppAdapter.kt
@@ -1,17 +1,23 @@
package com.illusionware.npsbrowser.adapters
+import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
import androidx.recyclerview.widget.RecyclerView
import com.illusionware.npsbrowser.AppData
import com.illusionware.npsbrowser.R
+import kotlin.collections.ArrayList
-class AppAdapter(private val appsList: ArrayList) : RecyclerView.Adapter() {
+class AppAdapter(private val appsList: ArrayList, val context : Context) : RecyclerView.Adapter() {
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
- var appTitle: TextView = view.findViewById(R.id.appItem)
+ var appTitle: TextView = view.findViewById(R.id.appTitle)
+ var appRegion: TextView = view.findViewById(R.id.appRegion)
+ var appMinFW: TextView = view.findViewById(R.id.appMinFW)
+ var appLastDate: TextView = view.findViewById(R.id.appLastDate)
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -19,7 +25,16 @@ class AppAdapter(private val appsList: ArrayList) : RecyclerView.Adapte
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
- holder.appTitle.text = appsList[position].Title
+ holder.appTitle.text = appsList[position].title
+ holder.appRegion.text = appsList[position].region
+ holder.appMinFW.text = appsList[position].minFW
+ holder.appMinFW.background = null;
+
+ if (holder.appMinFW.text.isNotBlank()) {
+ val drawable = ResourcesCompat.getDrawable(context.resources, R.drawable.rect_red, null)
+ holder.appMinFW.background = drawable;
+ }
+ holder.appLastDate.text = appsList[position].lastDateTime
}
override fun getItemCount(): Int {
diff --git a/app/src/main/res/drawable-v24/rect_light_blue.xml b/app/src/main/res/drawable-v24/rect_light_blue.xml
new file mode 100644
index 0000000..6db8c54
--- /dev/null
+++ b/app/src/main/res/drawable-v24/rect_light_blue.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_red.xml b/app/src/main/res/drawable/rect_red.xml
new file mode 100644
index 0000000..60b0a21
--- /dev/null
+++ b/app/src/main/res/drawable/rect_red.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_apps_list.xml b/app/src/main/res/layout/activity_apps_list.xml
index cae9d15..bdc8c96 100644
--- a/app/src/main/res/layout/activity_apps_list.xml
+++ b/app/src/main/res/layout/activity_apps_list.xml
@@ -1,11 +1,13 @@
-
+ android:scrollbars="vertical"
+ tools:listitem="@layout/list_item" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
index 75a250f..33944dd 100644
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@@ -2,6 +2,7 @@
@@ -9,34 +10,57 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="5dp">
+ android:padding="0dp">
+ app:cardBackgroundColor="@color/colorPrimary"
+ app:cardElevation="4dp"
+ app:cardUseCompatPadding="false"
+ app:contentPadding="15dp">
+
+
+
+
+
+