Merge pull request #4 from StudyProject-NLI/lara

Lara

Author: Maximilian Häming

.github/workflows/main.yml

@@ -19,8 +19,12 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
           cache: gradle
-      - name: Build with Gradle
-        run: ./gradlew build
+      - name: Create local gradle properties files
+        run: touch local.properties
+      - name: Add Google Maps API Key
+        run: echo "MAPS_API_KEY=${{secrets.MAPS_API_KEY}}" >> local.properties
+      - name: Build debug APK
+        run: ./gradlew build -x lint -x lintVitalRelease
       - name: Upload APK
         uses: actions/upload-artifact@v3.1.3
         with:

app/build.gradle

@@ -2,6 +2,8 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
+
 }
 
 android {
@@ -53,4 +55,7 @@ dependencies {
 
     // GSON dependency
     implementation 'com.google.code.gson:gson:2.8.5'
+
+    // Places API
+    implementation 'com.google.android.libraries.places:places:3.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -18,6 +18,10 @@
         android:theme="@style/Theme.NLInterface"
         tools:targetApi="31">
 
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="${MAPS_API_KEY}" />
+
         <activity
             android:name=".activities.MainActivity"
             android:exported="true"
@@ -36,15 +40,9 @@
         <activity
             android:name=".activities.GroceryListActivity" />
         <activity
-            android:name=".activities.NavigationActivity"/>
-        <activity
-            android:name=".activities.NextActivityExample"/>
-        <activity
-            android:name=".activities.LocationActivity"/>
+            android:name=".activities.PlaceDetailsActivity" />
         <activity
             android:name=".activities.SettingsActivity"/>
-        <activity
-            android:name=".activities.MotorModule"/>
 
     </application>
 

app/src/main/java/com/nlinterface/activities/GroceryListActivity.kt

@@ -1,27 +1,27 @@
 package com.nlinterface.activities
 
-import android.app.AlertDialog
-import android.content.res.Resources
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageButton
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.dialog.MaterialDialogs
 import com.nlinterface.R
 import com.nlinterface.adapters.GroceryListAdapter
 import com.nlinterface.databinding.ActivityGroceryListBinding
 import com.nlinterface.dataclasses.GroceryItem
 import com.nlinterface.interfaces.GroceryListCallback
 import com.nlinterface.utility.GlobalParameters
-import com.nlinterface.utility.SpeechToTextUtility
-import com.nlinterface.utility.setViewRelativeHeight
 import com.nlinterface.utility.setViewRelativeSize
 import com.nlinterface.viewmodels.GroceryListViewModel
 
@@ -73,6 +73,48 @@ class GroceryListActivity : AppCompatActivity(), GroceryListCallback {
         voiceActivationButton.setOnClickListener {
             onAddVoiceActivationButtonClick()
         }
+
+        ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
+            0, ItemTouchHelper.LEFT
+        ) {
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {return false}
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                val groceryItem: GroceryItem =
+                    groceryItemList[viewHolder.adapterPosition]
+
+                val index = viewHolder.adapterPosition
+
+                viewModel.deleteGroceryItem(groceryItem)
+
+                adapter.notifyItemRemoved(index)
+            }
+        }).attachToRecyclerView(rvGroceryList)
+
+        ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
+            0, ItemTouchHelper.RIGHT
+        ) {
+            override fun onMove(
+                recyclerView: RecyclerView,
+                viewHolder: RecyclerView.ViewHolder,
+                target: RecyclerView.ViewHolder
+            ): Boolean {return false}
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                val groceryItem: GroceryItem =
+                    groceryItemList[viewHolder.adapterPosition]
+
+                val index = viewHolder.adapterPosition
+
+                viewModel.deleteGroceryItem(groceryItem)
+
+                adapter.notifyItemRemoved(index)
+            }
+        }).attachToRecyclerView(rvGroceryList)
     }
 
     override fun onDestroy() {
@@ -86,14 +128,16 @@ class GroceryListActivity : AppCompatActivity(), GroceryListCallback {
 
     private fun onAddItemButtonClick() {
 
-        val alertDialog: AlertDialog? = this?.let {
-            val builder = AlertDialog.Builder(it)
-            val view = layoutInflater.inflate(R.layout.add_item_dialog, null)
+        val alertDialog: AlertDialog = this.let {
+            val builder = MaterialAlertDialogBuilder(it, R.style.ThemeOverlay_MaterialComponents_MaterialAlertDialog_Background)
+
+            val view = layoutInflater.inflate(R.layout.edit_text_dialog, null)
+
             builder.setView(view)
             builder.apply {
                 setPositiveButton(R.string.add) { _, _ ->
 
-                    val addItemEt = view.findViewById<EditText>(R.id.add_item_et)
+                    val addItemEt = view.findViewById<EditText>(R.id.et)
                     val newItemName = addItemEt.text.toString()
 
                     viewModel.addGroceryItem(newItemName)
@@ -103,17 +147,20 @@ class GroceryListActivity : AppCompatActivity(), GroceryListCallback {
                 setNegativeButton(R.string.cancel) { _, _ -> }
             }
             // Set other dialog properties
-            builder.setMessage(R.string.add_new_grocery_item)
+            builder.setTitle(R.string.add_new_grocery_item)
             // Create the AlertDialog
             builder.create()
         }
-        alertDialog?.show()
+        alertDialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+        alertDialog.show()
     }
 
+
+    
     override fun onLongClick(item: GroceryItem) {
         val index = groceryItemList.indexOf(item)
-        viewModel.deleteGroceryItem(item)
-        adapter?.notifyItemRemoved(index)
+        viewModel.placeGroceryItemInCart(item)
+        adapter.notifyItemChanged(index)
     }
 
 }