commit e9ed54069c1fff29c24c6e2cd627d9e0b718c7ce Author: Wyatt J. Miller Date: Tue Nov 16 21:20:20 2021 -0500 add all the things diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..3cc336b --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..9202674 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..37a7509 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..c343b87 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,39 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.2" + + defaultConfig { + applicationId "com.wyattjmiller.audiomanv3" + minSdkVersion 24 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.google.android.material:material:1.2.1' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/wyattjmiller/audiomanv3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/wyattjmiller/audiomanv3/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..dfe7f6b --- /dev/null +++ b/app/src/androidTest/java/com/wyattjmiller/audiomanv3/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.wyattjmiller.audiomanv3 + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.wyattjmiller.audiomanv3", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..ef2ac15 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/AboutActivity.kt b/app/src/main/java/com/wyattjmiller/audiomanv3/AboutActivity.kt new file mode 100644 index 0000000..f13365e --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/AboutActivity.kt @@ -0,0 +1,24 @@ +package com.wyattjmiller.audiomanv3 + +import android.content.SharedPreferences +import android.os.Bundle +import android.preference.PreferenceManager +import androidx.appcompat.app.AppCompatActivity +import com.wyattjmiller.audiomanv3.SettingsFragment + +class AboutActivity : AppCompatActivity() { + private var mSharedPrefs: SharedPreferences? = null + private var mDarkTheme = false + + override fun onCreate(savedInstanceState: Bundle?) { + mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this) + mDarkTheme = mSharedPrefs!!.getBoolean(SettingsFragment.PREFERENCE_THEME, false) + + if (mDarkTheme) { + setTheme(R.style.DarkTheme) + } + + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_about) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/AboutFragment.kt b/app/src/main/java/com/wyattjmiller/audiomanv3/AboutFragment.kt new file mode 100644 index 0000000..9e77b29 --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/AboutFragment.kt @@ -0,0 +1,16 @@ +package com.wyattjmiller.audiomanv3 + +import android.app.Fragment +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +class AboutFragment : Fragment() { + private lateinit var mAboutTextView: TextView + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + return inflater.inflate(R.layout.fragment_about, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/MainActivity.kt b/app/src/main/java/com/wyattjmiller/audiomanv3/MainActivity.kt new file mode 100644 index 0000000..c015a56 --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/MainActivity.kt @@ -0,0 +1,250 @@ +package com.wyattjmiller.audiomanv3 + +import android.content.Intent +import android.content.SharedPreferences +import android.graphics.Color +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.preference.PreferenceManager +import android.view.* +import android.widget.TextView +import android.widget.Toast +import androidx.fragment.app.DialogFragment +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView + +class MainActivity : AppCompatActivity(), FoodDialogFragment.onCourseEnteredListener { + private var mFoodListRecyclerView: RecyclerView? = null + private var mFoodAdapter: FoodAdapter? = null + private lateinit var mFoodDb: FoodDatabase + private lateinit var mSelectedFood: Food + private var mActionMode: ActionMode? = null + private var mSelectedFoodPosition = RecyclerView.NO_POSITION + private lateinit var mDialog: FoodDialogFragment + private var mSharedPrefs: SharedPreferences? = null + private var mDarkTheme = false + + override fun onCreate(savedInstanceState: Bundle?) { + mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this) + mDarkTheme = mSharedPrefs!!.getBoolean(SettingsFragment.PREFERENCE_THEME, false) + + if (mDarkTheme) setTheme(R.style.DarkTheme) + + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + + + mFoodListRecyclerView = findViewById(R.id.foodRecyclerView) + mFoodDb = FoodDatabase.getInstance(applicationContext) + + val layoutManager: RecyclerView.LayoutManager = LinearLayoutManager(applicationContext) + mFoodListRecyclerView!!.layoutManager = layoutManager + mFoodAdapter = FoodAdapter(loadFoods()) + mFoodListRecyclerView!!.adapter = mFoodAdapter + } + + override fun onResume() { + super.onResume() + + // if theme is changed, change it here + val darkTheme = mSharedPrefs!!.getBoolean(SettingsFragment.PREFERENCE_THEME, false) + if (darkTheme != mDarkTheme) { + recreate() + } + } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + val inflater = menuInflater + inflater.inflate(R.menu.subject_menu, menu) + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + // Handle item selection + return when (item.itemId) { + R.id.settings -> { + val intent = Intent(this@MainActivity, SettingsActivity::class.java) + startActivity(intent) + true + } + R.id.about -> { + val intent = Intent(this@MainActivity, AboutActivity::class.java) + startActivity(intent) + true + } + else -> super.onOptionsItemSelected(item) + } + } + + override fun onCourseEntered(food: Food) { + if (food != null) { + if (food.id == 0) { + if (mFoodDb.addFood(food)) { + mFoodAdapter?.addCourse(food) + } else { + val message = resources.getString("Already exists!".toInt(), food) + Toast.makeText(this@MainActivity, message, Toast.LENGTH_SHORT).show() + } + } else { + if (food.id != 0) { + mFoodDb.updateFood(food) + mFoodAdapter?.updateCourse(food) + } else { + // ?? + } + } + } + } + + fun addFoodClick(view: View?) { + mDialog = RecordDialogFragment() + mDialog.getContext(FoodContext.ADD, mFoodDb) + mDialog.show(supportFragmentManager, "") + } + + private fun loadFoods() : MutableList { + return mFoodDb.getFoods() + } + + + private inner class FoodHolder(inflater: LayoutInflater, parent: ViewGroup?) : RecyclerView.ViewHolder(inflater.inflate(R.layout.recycler_view_items, parent, false)), View.OnClickListener, View.OnLongClickListener { + private var mFood: Food? = null + private val mTextView: TextView + + fun bind(food: Food) { + mFood = food + mTextView.text = food.foodRestaurant + mTextView.setBackgroundColor(Color.LTGRAY) + } + + override fun onClick(view: View) { + // TODO + mDialog = FoodDialogFragment() + mDialog.getContext(FoodContext.VIEW, mFoodDb) + mDialog.getFoodId(mFood?.id!!) + mDialog.show(supportFragmentManager, "") + } + + override fun onLongClick(view: View?): Boolean { + if (mActionMode != null) { + return false + } + + mSelectedFood = mFood!! + mSelectedFoodPosition = adapterPosition + + // Re-bind the selected item + mFoodAdapter?.notifyItemChanged(mSelectedFoodPosition) + + // Show the CAB + mActionMode = this@MainActivity.startActionMode(mActionModeCallback)!! + return true + } + + private val mActionModeCallback: ActionMode.Callback = object : ActionMode.Callback { + override fun onCreateActionMode(mode: ActionMode, menu: Menu?): Boolean { + // Provide context menu for CAB + val inflater = mode.menuInflater + inflater.inflate(R.menu.context_menu, menu) + return true + } + + override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean { + return false + } + + override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean { + // Process action item selection + return when (item.itemId) { + R.id.delete -> { + // Delete from the database and remove from the RecyclerView + mFoodDb.deleteFood(mSelectedFood) + mFoodAdapter?.removeCourse(mSelectedFood) + + // Close the CAB + mode.finish() + true + } + R.id.edit -> { + // TODO + // up comes a dialog box editing the desired list item + mFoodAdapter?.takeCourseIndex() + mDialog = FoodDialogFragment() + mDialog.getContext(FoodContext.EDIT, mFoodDb) + mDialog.getFoodId(mSelectedFood.id!!) + mDialog.show(supportFragmentManager, "") + true + } + else -> false + } + } + + override fun onDestroyActionMode(mode: ActionMode) { + mActionMode = null + + // CAB closing, need to deselect item if not deleted + mFoodAdapter?.notifyItemChanged(mSelectedFoodPosition) + mSelectedFoodPosition = RecyclerView.NO_POSITION + } + } + + init { + itemView.setOnClickListener(this) + itemView.setOnLongClickListener(this) + mTextView = itemView.findViewById(R.id.foodTextView) + } + } + + private inner class FoodAdapter(private val mCourseList: MutableList) : RecyclerView.Adapter() { + private var mOldCourseIndex = 0 + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FoodHolder { + val layoutInflater = LayoutInflater.from(applicationContext) + return FoodHolder(layoutInflater, parent) + } + + override fun onBindViewHolder(holder: FoodHolder, position: Int) { + holder.bind(mCourseList[position]) + } + + override fun getItemCount(): Int { + return mCourseList.size + } + + fun takeCourseIndex() { + val index = mSelectedFoodPosition + mOldCourseIndex = index + } + + fun removeCourse(course: Food?) { + // Find subject in the list + val index = mCourseList.indexOf(course) + if (index >= 0) { + // Remove the subject + mCourseList.removeAt(index) + + // Notify adapter of subject removal + notifyItemRemoved(index) + } + } + + fun addCourse(course: Food?) { + // Add the new subject at the beginning of the list + mCourseList.add(0, course!!) + + // Notify the adapter that item was added to the beginning of the list + notifyItemInserted(0) + + // Scroll to the top + mFoodListRecyclerView?.scrollToPosition(0) + } + + fun updateCourse(course: Food?) { + mCourseList.removeAt(mOldCourseIndex) + mCourseList.add(0, course!!) + notifyItemChanged(0) + mFoodListRecyclerView?.scrollToPosition(0) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/MainFragment.kt b/app/src/main/java/com/wyattjmiller/audiomanv3/MainFragment.kt new file mode 100644 index 0000000..7453865 --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/MainFragment.kt @@ -0,0 +1,22 @@ +package com.wyattjmiller.audiomanv3 + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.app.NotificationCompat +import androidx.fragment.app.Fragment + +class MainFragment : Fragment() { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_main, container, false) + } + + companion object { + const val CHANNEL_ID = "channel_id" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/RecordDialogFragment.kt b/app/src/main/java/com/wyattjmiller/audiomanv3/RecordDialogFragment.kt new file mode 100644 index 0000000..7204f14 --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/RecordDialogFragment.kt @@ -0,0 +1,148 @@ +package com.wyattjmiller.audiomanv3 + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import android.widget.Button +import android.widget.EditText +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AlertDialog +import androidx.fragment.app.DialogFragment + +class RecordDialogFragment : DialogFragment() { + private var mTitleTextView: TextView? = null + private lateinit var mRestaurantTextView: TextView + private lateinit var mWebsiteTextView: TextView + private lateinit var mFavoriteFoodTextView: TextView + private lateinit var mRestaurantEditText: EditText + private lateinit var mWebsiteEditText: EditText + private lateinit var mFavoriteFoodEditText: EditText + private lateinit var mConfirmButton: Button + private var mRecord: Food = Food() + private lateinit var mFoodDb: FoodDatabase + private lateinit var mFoodContext: FoodContext + + interface onCourseEnteredListener { + fun onCourseEntered(food: Food) + } + + private var mListener: onCourseEnteredListener? = null + + + override fun onAttach(context: Context) { + super.onAttach(context) + mListener = context as onCourseEnteredListener + } + + override fun onCreateDialog(savedInstanceState: Bundle?) : Dialog { + val builder = AlertDialog.Builder(this.activity!!) + val dialogView = activity!!.layoutInflater.inflate(R.layout.activity_main_edit, null) + + mTitleTextView = dialogView.findViewById(R.id.textViewTitle) + + mRestaurantTextView = dialogView.findViewById(R.id.textViewRestaurant) + mWebsiteTextView = dialogView.findViewById(R.id.textViewWebiste) + mFavoriteFoodTextView = dialogView.findViewById(R.id.textViewFavoriteFood) + + mRestaurantEditText = dialogView.findViewById(R.id.editTextRestaurant) + mWebsiteEditText = dialogView.findViewById(R.id.editTextWebsite) + mFavoriteFoodEditText = dialogView.findViewById(R.id.editTextFavoriteFood) + + mConfirmButton = dialogView.findViewById(R.id.buttonConfirm) + + when (mFoodContext) { + FoodContext.ADD -> { + mTitleTextView?.text = getString(R.string.food_title_add) + mConfirmButton.text = getString(R.string.food_add) + } + FoodContext.EDIT -> { + val food = mFoodDb.getFood(mFood.id!!) + + mTitleTextView?.text = getString(R.string.food_title_edit) + mConfirmButton.text = getString(R.string.food_update) + + mRestaurantEditText.setText(food.foodRestaurant) + mWebsiteEditText.setText(food.foodWebsite) + mFavoriteFoodEditText.setText(food.foodFavorite) + } + FoodContext.VIEW -> { + val food = mFoodDb.getFood(mFood.id!!) + + mTitleTextView?.text = getString(R.string.food_title_view) + mConfirmButton.text = getString(R.string.food_view) + + mRestaurantEditText.setText(food.foodRestaurant) + mWebsiteEditText.setText(food.foodWebsite) + mFavoriteFoodEditText.setText(food.foodFavorite) + + mRestaurantEditText.setTextIsSelectable(false) + mWebsiteEditText.setTextIsSelectable(false) + mFavoriteFoodEditText.setTextIsSelectable(false) + } + } + + builder.setView(dialogView) + + mConfirmButton.setOnClickListener { + when (mFoodContext) { + FoodContext.ADD -> { + mFood.foodRestaurant = mRestaurantEditText.text.toString() + mFood.foodWebsite = mWebsiteEditText.text.toString() + mFood.foodFavorite = mFavoriteFoodEditText.text.toString() + + if (validityCheck()) { + mListener?.onCourseEntered(mFood) + dismiss() + } + } + FoodContext.EDIT -> { + mFood.foodRestaurant = mRestaurantEditText.text.toString() + mFood.foodWebsite = mWebsiteEditText.text.toString() + mFood.foodFavorite = mFavoriteFoodEditText.text.toString() + + if (validityCheck()) { + mListener?.onCourseEntered(mFood) + dismiss() + } + } + FoodContext.VIEW -> { +// mRestaurantEditText + dismiss() + } + } + } + + return builder.create() + } + + private fun validityCheck(): Boolean { + val regex = "^((https?|ftp|smtp):\\/\\/)?(www.)?[a-z0-9]+\\.[a-z]+(\\/[a-zA-Z0-9#]+\\/?)*\$".toRegex() + return if (mRestaurantEditText?.text.toString() == "" || + mWebsiteEditText?.text.toString() == "" || + mFavoriteFoodEditText?.text.toString() == "") { + Toast.makeText(this.activity!!, "Please fill in all of the fields", Toast.LENGTH_LONG).show() + false + } else { + if (regex.matches(mWebsiteEditText?.text.toString())) true else { + Toast.makeText(this.activity!!, "Is this a URL?", Toast.LENGTH_LONG).show() + false + } + } + } + + fun getContext(context: FoodContext, database: FoodDatabase) { + mFoodContext = context + mFoodDb = database + } + + fun getFoodId(foodId: Int) { + mFood?.id = foodId + } + + companion object { + + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/SettingsActivity.java b/app/src/main/java/com/wyattjmiller/audiomanv3/SettingsActivity.java new file mode 100644 index 0000000..3ca473b --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/SettingsActivity.java @@ -0,0 +1,28 @@ +package com.wyattjmiller.audiomanv3; + +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.PreferenceManager; + +import androidx.appcompat.app.AppCompatActivity; + +public class SettingsActivity extends AppCompatActivity { + private SharedPreferences mSharedPrefs; + private boolean mDarkTheme; + + @Override + protected void onCreate(Bundle savedInstanceState) { + mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); + mDarkTheme = mSharedPrefs.getBoolean(SettingsFragment.PREFERENCE_THEME, false); + if (mDarkTheme) { + setTheme(R.style.DarkTheme); + } + + super.onCreate(savedInstanceState); + + // Display the fragment as the main content + getFragmentManager().beginTransaction() + .replace(android.R.id.content, new SettingsFragment()) + .commit(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wyattjmiller/audiomanv3/SettingsFragment.java b/app/src/main/java/com/wyattjmiller/audiomanv3/SettingsFragment.java new file mode 100644 index 0000000..4e4072b --- /dev/null +++ b/app/src/main/java/com/wyattjmiller/audiomanv3/SettingsFragment.java @@ -0,0 +1,23 @@ +package com.wyattjmiller.audiomanv3; + +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.PreferenceFragment; +import android.preference.PreferenceManager; + +public class SettingsFragment extends PreferenceFragment { + + public static String PREFERENCE_THEME = "pref_theme"; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Load the preferences from an XML resource + addPreferencesFromResource(R.xml.preferences); + + // Access the default shared prefs + SharedPreferences sharedPrefs = + PreferenceManager.getDefaultSharedPreferences(getActivity()); + } +} diff --git a/app/src/main/res/drawable-v24/add.xml b/app/src/main/res/drawable-v24/add.xml new file mode 100644 index 0000000..eb23254 --- /dev/null +++ b/app/src/main/res/drawable-v24/add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v24/delete.xml b/app/src/main/res/drawable-v24/delete.xml new file mode 100644 index 0000000..3c4030b --- /dev/null +++ b/app/src/main/res/drawable-v24/delete.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v24/edit.xml b/app/src/main/res/drawable-v24/edit.xml new file mode 100644 index 0000000..2844baf --- /dev/null +++ b/app/src/main/res/drawable-v24/edit.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v24/help.xml b/app/src/main/res/drawable-v24/help.xml new file mode 100644 index 0000000..c0c9268 --- /dev/null +++ b/app/src/main/res/drawable-v24/help.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/settings.xml b/app/src/main/res/drawable-v24/settings.xml new file mode 100644 index 0000000..41a82ed --- /dev/null +++ b/app/src/main/res/drawable-v24/settings.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..8bad203 --- /dev/null +++ b/app/src/main/res/layout/activity_about.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..4265f88 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + \ 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 new file mode 100644 index 0000000..f27f5e5 --- /dev/null +++ b/app/src/main/res/layout/activity_settings.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml new file mode 100644 index 0000000..6438618 --- /dev/null +++ b/app/src/main/res/layout/fragment_about.xml @@ -0,0 +1,40 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..fe23a43 --- /dev/null +++ b/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/recycler_view_items.xml b/app/src/main/res/layout/recycler_view_items.xml new file mode 100644 index 0000000..c1aed11 --- /dev/null +++ b/app/src/main/res/layout/recycler_view_items.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/context_menu.xml b/app/src/main/res/menu/context_menu.xml new file mode 100644 index 0000000..d09a6c9 --- /dev/null +++ b/app/src/main/res/menu/context_menu.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/app/src/main/res/menu/subject_menu.xml b/app/src/main/res/menu/subject_menu.xml new file mode 100644 index 0000000..623be1e --- /dev/null +++ b/app/src/main/res/menu/subject_menu.xml @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..fadf922 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,8 @@ + + + #000 + #023 + #BBB + #999 + #555 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c572a93 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AudioMan + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..1c0102d --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml new file mode 100644 index 0000000..04b0195 --- /dev/null +++ b/app/src/main/res/xml/preferences.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/test/java/com/wyattjmiller/audiomanv3/ExampleUnitTest.kt b/app/src/test/java/com/wyattjmiller/audiomanv3/ExampleUnitTest.kt new file mode 100644 index 0000000..aab060c --- /dev/null +++ b/app/src/test/java/com/wyattjmiller/audiomanv3/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.wyattjmiller.audiomanv3 + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..33d6ece --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.4.10" + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:4.0.1" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4d15d01 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b107330 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Dec 12 11:18:08 EST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b36ba10 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "AudioManv3" \ No newline at end of file