Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/build.gradle

Author: rodrigoapolo

.gitignore

@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+path.properties

.idea/.name

@@ -1,8 +1,14 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'kotlin-parcelize'
 }
 
+def pathPropertiesFile = rootProject.file("path.properties")
+def pathProperties = new Properties()
+pathProperties.load(new FileInputStream(pathPropertiesFile))
+
 android {
     namespace 'com.rodrigoapolo.gogarage'
     compileSdk 33
@@ -14,6 +20,9 @@ android {
         versionCode 1
         versionName "1.0"
 
+        buildConfigField("String", "PATH", pathProperties['PATH'])
+        buildConfigField("String", "PATHVIACEP", pathProperties['PATHVIACEP'])
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -24,22 +33,49 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    viewBinding {
+        enabled = true
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
 dependencies {
 
-
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    //Retrofit
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+
+    //CardView
+    implementation 'androidx.cardview:cardview:1.0.0'
+
+    //GooglePlay Services
+    implementation 'com.google.android.gms:play-services-location:21.0.1'
+
+    //Coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.0'
+
+    // ViewModel
+    def lifecycle_version = "2.5.0-alpha02"
+    def arch_version = "2.1.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
 }

.idea/compiler.xml

@@ -2,17 +2,51 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_logo_foreground"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.GoGarage"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".View.ReserveActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.PerfilActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.ShowGarageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.RegisterAddressGarageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.RegisterGaragemActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.HomeActivity"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
+        <activity
+            android:name=".View.RegisterUserActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.LoginActivity"
+            android:exported="false" />
+        <activity
+            android:name=".View.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

.idea/git_toolbox_prj.xml

@@ -0,0 +1,91 @@
+package com.rodrigoapolo.gogarage.View
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.GridLayoutManager
+import com.rodrigoapolo.gogarage.R
+import com.rodrigoapolo.gogarage.ViewModel.HomeViewModel
+import com.rodrigoapolo.gogarage.databinding.ActivityHomeBinding
+import com.rodrigoapolo.gogarage.dto.GarageDTO
+import com.rodrigoapolo.gogarage.model.AgendamentoModel
+import com.rodrigoapolo.gogarage.model.GarageModel
+import com.rodrigoapolo.gogarage.recyclerview.garage.GarageAdapter
+import com.rodrigoapolo.gogarage.recyclerview.garage.OnItemClickListenerGarage
+import com.rodrigoapolo.gogarage.util.SecurityPreferences
+
+
+class HomeActivity : AppCompatActivity(), OnItemClickListenerGarage {
+
+    private lateinit var viewModel: HomeViewModel
+    private lateinit var binding: ActivityHomeBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityHomeBinding.inflate(layoutInflater)
+        val village = SecurityPreferences(applicationContext).getStoredString("village")
+        viewModel = ViewModelProvider(this)[HomeViewModel::class.java]
+        window.statusBarColor = ContextCompat.getColor(this, R.color.blue_500)
+
+        createListenerData()
+        setRecyclerViewGarage()
+        getRecyclerViewgarage()
+        Log.i("village", village + " HOME")
+
+        if (village != "") {
+
+
+        } else {
+            Toast.makeText(this, "Não encontramos sua localização", Toast.LENGTH_LONG).show()
+        }
+
+
+
+        return setContentView(binding.root)
+    }
+
+    private fun createListenerData() {
+        binding.imaUser.setOnClickListener{
+            val intent = Intent(this, PerfilActivity::class.java)
+            startActivity(intent)
+        }
+    }
+
+    private fun getRecyclerViewgarage() {
+        val village = SecurityPreferences(applicationContext).getStoredString("village")
+        viewModel.setGarage(village)
+    }
+
+    private fun setRecyclerViewGarage() {
+        viewModel.garages.observe(this){
+            binding.recyclerView.apply {
+                layoutManager = GridLayoutManager(applicationContext, 1)
+                adapter = GarageAdapter(viewModel.garages.value!!, this@HomeActivity)
+            }
+        }
+    }
+
+    override fun onItemClick(garage: GarageModel) {
+        val garage: GarageDTO = GarageDTO(
+            garage.id,
+            garage.cobertura,
+            garage.horarioInicio,
+            garage.horarioTermino,
+            garage.taxaHorario,
+            garage.valorHora,
+            garage.alturaVaga,
+            garage.larguraVaga,
+            "",
+            "",
+            garage.endereco,
+            garage.pessoa.id
+        )
+        val intent = Intent(this, ShowGarageActivity::class.java)
+        val putExtra = intent.putExtra("garage", garage)
+        startActivities(arrayOf(intent))
+    }
+}