From 4bb4450e11539e8239b6787d4b2d34459ce13c7c Mon Sep 17 00:00:00 2001 From: amazing-username Date: Thu, 28 Mar 2019 20:51:58 -0400 Subject: [PATCH] Beginning work on #42. SettingsAdapter has not been implemented --- .../mear/activities/SettingsActivity.kt | 1 - .../example/mear/adapters/RecyclerAdapter.kt | 1 - .../example/mear/adapters/SettingsAdapter.kt | 23 ++++++ .../com/example/mear/models/SettingItems.kt | 4 + app/src/main/res/layout/activity_settings.xml | 7 +- app/src/main/res/layout/content_settings.xml | 22 ++++++ .../res/layout/fragment_settings_view.xml | 76 +++++++++++++++++++ 7 files changed, 131 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/example/mear/adapters/SettingsAdapter.kt create mode 100644 app/src/main/java/com/example/mear/models/SettingItems.kt create mode 100644 app/src/main/res/layout/fragment_settings_view.xml diff --git a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt index edf2471..5fb2e24 100644 --- a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt +++ b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt @@ -14,7 +14,6 @@ import com.example.mear.management.TrackManager import com.example.mear.repositories.TrackRepository - class SettingsActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt b/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt index c08f6e7..315bbdf 100644 --- a/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt +++ b/app/src/main/java/com/example/mear/adapters/RecyclerAdapter.kt @@ -16,7 +16,6 @@ import com.example.mear.models.TrackItems import com.example.mear.R - class RecyclerAdapter(val mOnClickListenerI: (TrackItems) -> Unit , private val trackItemsSourceInit: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/example/mear/adapters/SettingsAdapter.kt b/app/src/main/java/com/example/mear/adapters/SettingsAdapter.kt new file mode 100644 index 0000000..111ff01 --- /dev/null +++ b/app/src/main/java/com/example/mear/adapters/SettingsAdapter.kt @@ -0,0 +1,23 @@ +package com.example.mear.adapters + +import android.support.v7.widget.RecyclerView +import android.view.View +import android.view.ViewGroup + +import com.example.mear.models.SettingItems + +class SettingsAdapter(val settingItems: ArrayList) : RecyclerView.Adapter() { + + override fun getItemCount(): Int { + TODO("not implemented") + } + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + TODO("not implemented") + } + override fun onCreateViewHolder(parent: ViewGroup, position: Int): RecyclerView.ViewHolder { + TODO("not implemented") + } + + class SettingItemsHolder(v: View) : RecyclerView.ViewHolder(v) { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mear/models/SettingItems.kt b/app/src/main/java/com/example/mear/models/SettingItems.kt new file mode 100644 index 0000000..abefb06 --- /dev/null +++ b/app/src/main/java/com/example/mear/models/SettingItems.kt @@ -0,0 +1,4 @@ +package com.example.mear.models + +data class SettingItems(val id: Int, val settingTitle: String, val settingDescription: String) { +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 50f235f..0446312 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" android:background="@color/color_background" tools:context=".activities.SettingsActivity"> @@ -21,6 +22,10 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml index 7d193f9..7ac119b 100644 --- a/app/src/main/res/layout/content_settings.xml +++ b/app/src/main/res/layout/content_settings.xml @@ -8,6 +8,27 @@ tools:context=".activities.SettingsActivity" tools:showIn="@layout/activity_settings"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings_view.xml b/app/src/main/res/layout/fragment_settings_view.xml new file mode 100644 index 0000000..1dab4d4 --- /dev/null +++ b/app/src/main/res/layout/fragment_settings_view.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file