Cleaned up the code. There may be a bug ('vegetable' button not showing) in the filters area that Andrés and I missed.

Floradex20/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

Floradex20/app/src/main/AndroidManifest.xml

@@ -13,15 +13,15 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".activities.FilteringActivity"
-            android:parentActivityName=".activities.MainActivity" />
+            android:parentActivityName=".activities.RegisterActivity" />
         <activity
             android:name=".activities.LoginActivity"
-            android:parentActivityName=".activities.MainActivity" />
+            android:parentActivityName=".activities.RegisterActivity" />
         <activity android:name=".activities.DiscoverActivity">
 <!--            android:parentActivityName=".activities.MainActivity">-->
 
         </activity>
-        <activity android:name=".activities.MainActivity">
+        <activity android:name=".activities.RegisterActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -29,7 +29,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activities.VentantaActivity"
+            android:name=".activities.FlowerDetailActivity"
             android:parentActivityName=".activities.DiscoverActivity">
 
 

Floradex20/app/src/main/java/com/example/floradex20/ApiManager.kt

@@ -1,11 +1,10 @@
 package com.example.floradex20
 
 import android.view.View
-import com.example.floradex20.activities.ServiceBuilder
 import com.example.floradex20.interfaces.RestApi
-import com.example.floradex20.interfaces.TrefleService
-import com.example.floradex20.models.PlantListss
-import com.example.floradex20.models.UserInfo
+import com.example.floradex20.models.FlowersResponse
+import com.example.floradex20.models.User
+import com.example.floradex20.services.ServiceBuilder
 import com.google.android.material.snackbar.Snackbar
 import org.json.JSONObject
 import retrofit2.Call
@@ -15,13 +14,13 @@ import retrofit2.Response
 class ApiManager(val parent: View) {
 
 
-    fun addUser(userData: UserInfo, onResult: (UserInfo?) -> Unit){
+    fun addUser(userData: User, onResult: (User?) -> Unit){
         val retrofit = ServiceBuilder.buildService(RestApi::class.java)
-        retrofit.addUser(userData).enqueue(object: Callback<UserInfo> {
-            override fun onFailure(call: Call<UserInfo>, t: Throwable) {
+        retrofit.addUser(userData).enqueue(object: Callback<User> {
+            override fun onFailure(call: Call<User>, t: Throwable) {
                 Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
             }
-            override fun onResponse(call: Call<UserInfo>, response: Response<UserInfo>) {
+            override fun onResponse(call: Call<User>, response: Response<User>) {
                 if(response.code() == 500 || response.code() == 400) {
                     val responseString = response.errorBody()!!.string()
                     val message = JSONObject(responseString).getString("error")
@@ -34,13 +33,13 @@ class ApiManager(val parent: View) {
     }
 
 
-    fun logInUser(userData: UserInfo, onResult: (UserInfo?) -> Unit) {
+    fun logInUser(userData: User, onResult: (User?) -> Unit) {
         val retrofit = ServiceBuilder.buildService(RestApi::class.java)
-        retrofit.logInUser(userData).enqueue(object: Callback<UserInfo> {
-            override fun onFailure(call: Call<UserInfo>, t: Throwable) {
+        retrofit.logInUser(userData).enqueue(object: Callback<User> {
+            override fun onFailure(call: Call<User>, t: Throwable) {
                 Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
             }
-            override fun onResponse(call: Call<UserInfo>, response: Response<UserInfo>) {
+            override fun onResponse(call: Call<User>, response: Response<User>) {
 
                 if(response.code() == 500 || response.code() == 400) {
                     val responseString = response.errorBody()!!.string()
@@ -54,13 +53,13 @@ class ApiManager(val parent: View) {
     }
 
 
-    fun getPlants(user_id: String, onResult: (PlantListss) -> Unit) {
+    fun getPlants(user_id: String, onResult: (FlowersResponse) -> Unit) {
         val request = ServiceBuilder.buildService(RestApi::class.java)
-        request.getPlants(user_id).enqueue(object: Callback<PlantListss> {
-            override fun onFailure(call: Call<PlantListss>, t: Throwable) {
+        request.getPlants(user_id).enqueue(object: Callback<FlowersResponse> {
+            override fun onFailure(call: Call<FlowersResponse>, t: Throwable) {
                 Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
             }
-            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
+            override fun onResponse(call: Call<FlowersResponse>, response: Response<FlowersResponse>) {
                 if (response.code() == 500 || response.code() == 400) {
                     val responseString = response.errorBody()!!.string()
                     val message = JSONObject(responseString).getString("error")
@@ -72,13 +71,14 @@ class ApiManager(val parent: View) {
         })
     }
 
-    fun getPlantsByName(user_id: String, search_input: String, onResult: (PlantListss) -> Unit) {
+
+    fun getPlantsByName(user_id: String, search_input: String, onResult: (FlowersResponse) -> Unit) {
         val request = ServiceBuilder.buildService(RestApi::class.java)
-        request.getPlantsbyName(user_id, search_input).enqueue(object: Callback<PlantListss> {
-            override fun onFailure(call: Call<PlantListss>, t: Throwable) {
+        request.getPlantsbyName(user_id, search_input).enqueue(object: Callback<FlowersResponse> {
+            override fun onFailure(call: Call<FlowersResponse>, t: Throwable) {
                 Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
             }
-            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
+            override fun onResponse(call: Call<FlowersResponse>, response: Response<FlowersResponse>) {
                 if (response.code() == 500 || response.code() == 400) {
                     val responseString = response.errorBody()!!.string()
                     val message = JSONObject(responseString).getString("error")
@@ -90,13 +90,14 @@ class ApiManager(val parent: View) {
         })
     }
 
-    fun getFiltered(user_id: String, edible: String, vegetable: String, color: String, scientificName: String, onResult: (PlantListss) -> Unit) {
+
+    fun getFiltered(user_id: String, edible: String, vegetable: String, color: String, scientificName: String, onResult: (FlowersResponse) -> Unit) {
         val request = ServiceBuilder.buildService(RestApi::class.java)
-        request.getFiltered(user_id, edible, vegetable, color, scientificName).enqueue(object: Callback<PlantListss> {
-            override fun onFailure(call: Call<PlantListss>, t: Throwable) {
+        request.getFiltered(user_id, edible, vegetable, color, scientificName).enqueue(object: Callback<FlowersResponse> {
+            override fun onFailure(call: Call<FlowersResponse>, t: Throwable) {
                 Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
             }
-            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
+            override fun onResponse(call: Call<FlowersResponse>, response: Response<FlowersResponse>) {
                 if (response.code() == 500 || response.code() == 400) {
                     val responseString = response.errorBody()!!.string()
                     val message = JSONObject(responseString).getString("error")
@@ -109,5 +110,4 @@ class ApiManager(val parent: View) {
     }
 
 
-
 }

Floradex20/app/src/main/java/com/example/floradex20/activities/DiscoverActivity.kt

@@ -15,37 +15,12 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.floradex20.ApiManager
 import com.example.floradex20.R
-import com.example.floradex20.models.Data
-
-
-//Cosas para que lleguen las flores
-//private const val TOKEN: String = "cMyugCJvk-U_xoi31FVBgoEqZiuRnDYpP8fv8Vfiejg"
-//private const val  BASE_URL = "https://trefle.io/"
-//var slug: String = "prunella-vulgaris"
-//private const val ada_link = "https://ada.uprrp.edu/"
-//Creo que mas cosas para que lleguen las flores
-//object ServiceBuilder {
-//
-//    val client = OkHttpClient.Builder().build()
-//
-//    var retrofit: Retrofit = Retrofit.Builder()
-//            .baseUrl(ada_link)
-//            .addConverterFactory(GsonConverterFactory.create())
-//            .client(client)
-//            .build()
-//
-//    fun <T> buildService(service: Class<T>): T {
-//        return retrofit.create(service)
-//    }
-//}
-
-
-//Main Activity
+import com.example.floradex20.adapters.FlowerAdapter
+import com.example.floradex20.models.Flower
+
 class DiscoverActivity : AppCompatActivity(), FlowerAdapter.OnItemClickListener {
     private lateinit var recyclerView: RecyclerView
-    private lateinit var plants: List<Data>
-
-    var search_input: String = ""     //Guarda search input de user
+    private lateinit var plants: List<Flower>
 
 
     //Para desplegar el boton de filtro en Discover Page
@@ -57,7 +32,7 @@ class DiscoverActivity : AppCompatActivity(), FlowerAdapter.OnItemClickListener
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.discover_activity)
+        setContentView(R.layout.activity_discover)
 
         //Donde se guarda el input del search bar y el search button
         val enterButton = findViewById<Button>(R.id.search_enter)
@@ -90,7 +65,7 @@ class DiscoverActivity : AppCompatActivity(), FlowerAdapter.OnItemClickListener
         //Esto se ejecuta cuando el usuario hace un search con el search bar
         enterButton?.setOnClickListener {
 
-            search_input = input.text.toString()
+            val search_input = input.text.toString()
 
             apimanager.getPlantsByName(userID, search_input) {
 
@@ -114,7 +89,7 @@ class DiscoverActivity : AppCompatActivity(), FlowerAdapter.OnItemClickListener
         //Empezar el activity de Jose
         val plantInfo = arrayOf<String>(plants[position].common_name.toString(), plants[position].scientific_name.toString()
                 , plants[position].year.toString(), plants[position].author.toString(), plants[position].image_url.toString())
-        val intent = Intent(this, VentantaActivity::class.java).apply {
+        val intent = Intent(this, FlowerDetailActivity::class.java).apply {
             putExtra("plant_info", plantInfo)
         }
         startActivity(intent)

Floradex20/app/src/main/java/com/example/floradex20/activities/FilteringActivity.kt

@@ -28,25 +28,23 @@ class FilteringActivity : AppCompatActivity() {
         var nom_cientifico: String = ""
         var color_flor: String = ""
 
-        edibleToggle.setOnCheckedChangeListener{ _, isChecked ->
+        edibleToggle.setOnCheckedChangeListener{_, isChecked ->
             if (isChecked){
                 edible = "true"
-            }
-            else{
+            } else {
                 edible = "false"
             }
         }
-        vegetableToggle.setOnCheckedChangeListener{ _, isChecked ->
+        vegetableToggle.setOnCheckedChangeListener{_, isChecked ->
             if (isChecked){
                 vegetable = "true"
-            }
-            else{
+            } else {
                 vegetable = "false"
             }
         }
 
         //Cuando usuario le da apply se envia los filter values a main activity
-        apply.setOnClickListener(){
+        apply.setOnClickListener {
 
             color_flor = colorTxt.text.toString()
             nom_cientifico = sciTxt.text.toString()

Floradex20/app/src/main/java/com/example/floradex20/activities/VentantaActivity.kt → Floradex20/app/src/main/java/com/example/floradex20/activities/FlowerDetailActivity.kt

@@ -8,12 +8,11 @@ import androidx.appcompat.app.AppCompatActivity
 import com.example.floradex20.R
 import com.squareup.picasso.Picasso
 
-class VentantaActivity(): AppCompatActivity() {
+class FlowerDetailActivity : AppCompatActivity() {
 
-//    val planta:Data = plant
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.ventanita)
+        setContentView(R.layout.activity_flower_detail)
 
         val plant = intent.getStringArrayExtra("plant_info")
 
@@ -25,19 +24,18 @@ class VentantaActivity(): AppCompatActivity() {
 
         nom_planta.text = "Salu2"
 
-    if (plant != null) {
+        if (plant != null) {
 
-        nom_planta.text = plant.get(0)
-        nom_sci.text = plant.get(1)
-        year.text = plant.get(2)
-        author.text = plant.get(3)
-        Picasso.get().load(plant.get(4)).into(imagen_planta)
-    }
-
-    else {
-        Log.i("Desde ventana kt", "Llega null el valor. Te la mamaste")
-    }
+            nom_planta.text = plant.get(0)
+            nom_sci.text = plant.get(1)
+            year.text = plant.get(2)
+            author.text = plant.get(3)
+            Picasso.get().load(plant.get(4)).into(imagen_planta)
+        }
 
+        else {
+            Log.i("Desde ventana kt", "Llega null el valor. Te la mamaste")
+        }
 
     }
 }

Floradex20/app/src/main/java/com/example/floradex20/activities/LoginActivity.kt

@@ -10,7 +10,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.example.floradex20.ApiManager
 import com.example.floradex20.R
-import com.example.floradex20.models.UserInfo
+import com.example.floradex20.models.User
 //import com.example.login.ApiManager
 //import com.example.login.UserInfo
 import com.google.android.material.snackbar.Snackbar
@@ -19,7 +19,7 @@ class LoginActivity: AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.login)
+        setContentView(R.layout.activity_login)
 
 
         val b: Button
@@ -47,7 +47,7 @@ class LoginActivity: AppCompatActivity() {
 
 
             //Hasta aqui funciona
-            val user_info = UserInfo(null, user_email, user_password, null, null)
+            val user_info = User(null, user_email, user_password, null, null)
             val apimanager = ApiManager(it)
             val thisActivity = it
 //            user_info.user_email?.let { it1 -> Log.i("check instance info", it1) }
@@ -69,11 +69,11 @@ class LoginActivity: AppCompatActivity() {
                     ).setAction("Action", null).show()
 
                     val user_id: String? = it?.id
-//                    val user_name: String? = it?.user_name
+//                    val user_name: String? = it?.username
                     val sharedPref: SharedPreferences = applicationContext.getSharedPreferences("user_info", Context.MODE_PRIVATE)
                     val editor = sharedPref.edit()
                     editor.putString("user_id", user_id)
-//                    editor.putString("user_name", user_name)
+//                    editor.putString("user_name", username)
                     editor.apply()
 
 

Floradex20/app/src/main/java/com/example/floradex20/activities/MainActivity.kt → Floradex20/app/src/main/java/com/example/floradex20/activities/RegisterActivity.kt

@@ -10,37 +10,15 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.example.floradex20.ApiManager
 import com.example.floradex20.R
-import com.example.floradex20.models.UserInfo
+import com.example.floradex20.models.User
 import com.google.android.material.snackbar.Snackbar
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
-
-private const val ada_link = "https://ada.uprrp.edu/"
-
-object ServiceBuilder {
-    private val client = OkHttpClient.Builder().build()
-
-    private val retrofit = Retrofit.Builder()
-            .baseUrl(ada_link) // change this IP for testing by your actual machine IP
-
-            .addConverterFactory(GsonConverterFactory.create())
-            .client(client)
-            .build()
-
-    fun<T> buildService(service: Class<T>): T{
-        return retrofit.create(service)
-    }
-}
-
-class MainActivity() : AppCompatActivity() {
+class RegisterActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
 
-
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.register)
+        setContentView(R.layout.activity_register)
 
         val sharedPref: SharedPreferences = applicationContext.getSharedPreferences("user_info", Context.MODE_PRIVATE)
 
@@ -92,7 +70,7 @@ class MainActivity() : AppCompatActivity() {
             //Manda el info a la base de datos
             else {
 
-                val user_info = UserInfo(full_name, user_email, user_password, null, null)
+                val user_info = User(full_name, user_email, user_password, null, null)
                 val apimanager = ApiManager(it)
                 val thisActivity = it
 
@@ -106,7 +84,7 @@ class MainActivity() : AppCompatActivity() {
 
                     //Se guarda el username y id
                     val user_id: String? = it?.id
-                    val user_name: String? = it?.user_name
+                    val user_name: String? = it?.username
                     val sharedPref: SharedPreferences = applicationContext.getSharedPreferences("user_info", Context.MODE_PRIVATE)
                     val editor = sharedPref.edit()
                     editor.putString("user_id", user_id)

Floradex20/app/src/main/java/com/example/floradex20/activities/FlowerAdapter.kt → Floradex20/app/src/main/java/com/example/floradex20/adapters/FlowerAdapter.kt

@@ -1,4 +1,4 @@
-package com.example.floradex20.activities
+package com.example.floradex20.adapters
 
 import android.view.LayoutInflater
 import android.view.View
@@ -7,17 +7,16 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.example.floradex20.R
-import com.example.floradex20.models.Data
+import com.example.floradex20.models.Flower
 import com.squareup.picasso.Picasso
 
-
-class FlowerAdapter(val flowers: List<Data>, private val listener: OnItemClickListener): RecyclerView.Adapter<FlowerAdapter.PlantViewHolder>() {
+class FlowerAdapter(val flowers: List<Flower>, private val listener: OnItemClickListener): RecyclerView.Adapter<FlowerAdapter.PlantViewHolder>() {
 
 //    var listen: onItemClickListener
 //    this.listen = listener
 //    val listen:OnItemClickListener = listener
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PlantViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.layout, parent, false)
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.row_flower, parent, false)
         return PlantViewHolder(view)
     }
 
@@ -48,7 +47,7 @@ class FlowerAdapter(val flowers: List<Data>, private val listener: OnItemClickLi
 
         }
 
-        fun bind(plant: Data, plantviewer: PlantViewHolder) {
+        fun bind(plant: Flower, plantviewer: PlantViewHolder) {
             //Pone foto y nombre de la planta a la tarjeta
             val imageurl: String = plant.image_url
             Picasso.get().load(imageurl).into(photo)
@@ -60,7 +59,7 @@ class FlowerAdapter(val flowers: List<Data>, private val listener: OnItemClickLi
 
     }
 
-    public interface OnItemClickListener {
+    interface OnItemClickListener {
 
         //Metodo que va a usar el activity pa hacer cosas
         fun onItemClick(position: Int)

Floradex20/app/src/main/java/com/example/floradex20/interfaces/RestApi.kt

@@ -1,7 +1,7 @@
 package com.example.floradex20.interfaces
 
-import com.example.floradex20.models.PlantListss
-import com.example.floradex20.models.UserInfo
+import com.example.floradex20.models.FlowersResponse
+import com.example.floradex20.models.User
 import retrofit2.Call
 import retrofit2.http.*
 
@@ -9,28 +9,29 @@ interface RestApi {
 
     @Headers("Content-Type: application/json")
     @POST("~victor.hernandez17/flowerdex/signup.php")
-    fun addUser(@Body userData: UserInfo): Call<UserInfo>
+    fun addUser(@Body userData: User): Call<User>
 
     @Headers("Content-Type: application/json")
     @POST("~victor.hernandez17/flowerdex/login.php")
-    fun logInUser(@Body UserData: UserInfo): Call<UserInfo>
+    fun logInUser(@Body userData: User): Call<User>
 
 
     @GET("~victor.hernandez17/flowerdex/listFlowers.php") // /api/v1/plants/
     //Quite el id de la planta para recibir mas cosas
     //Posiblemente se puede overload la funcion para q funcione sin id y con id
-    fun getPlants(@Query("user_id") user_id: String): Call<PlantListss>
+    fun getPlants(@Query("user_id") user_id: String): Call<FlowersResponse>
 
     //El Api Query que se usa cuando se hace un search
     @GET("~victor.hernandez17/flowerdex/listFlowers.php") // /api/v1/plants/search/
     fun getPlantsbyName(@Query("user_id") user_id: String,
-                        @Query("q") q: String): Call<PlantListss>
+                        @Query("q") q: String): Call<FlowersResponse>
 
     //Api query para el filter
     @GET("~victor.hernandez17/flowerdex/listFlowers.php") // api/v1/plants/
     fun getFiltered(@Query("user_id") user_id: String,
                     @Query("edible") edible: String,
                     @Query("vegetable") vegetable: String,
-                    @Query("flower_color") color: String,
-                    @Query("scientific_name") scientificName: String): Call<PlantListss>
+                    @Query("flower_color") color: String, // TODO: get rid of this, as it it's not used by ADA
+                    @Query("scientific_name") scientificName: String): Call<FlowersResponse>
+    
 }

Floradex20/app/src/main/java/com/example/floradex20/interfaces/TrefleService.kt

@@ -1,6 +1,6 @@
 package com.example.floradex20.interfaces
 
-import com.example.floradex20.models.PlantListss
+import com.example.floradex20.models.FlowersResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
@@ -9,12 +9,12 @@ interface TrefleService {
     @GET("/api/v1/plants/")
     //Quite el id de la planta para recibir mas cosas
     //Posiblemente se puede overload la funcion para q funcione sin id y con id
-    fun getPlants(@Query("token") token: String): Call<PlantListss>
+    fun getPlants(@Query("token") token: String): Call<FlowersResponse>
 
     //El Api Query que se usa cuando se hace un search
     @GET("/api/v1/plants/search/")
     fun getPlantsbyName(@Query("token") token: String,
-                        @Query("q") q: String): Call<PlantListss>
+                        @Query("q") q: String): Call<FlowersResponse>
 
     //Api query para el filter
     @GET("api/v1/plants/")
@@ -22,7 +22,7 @@ interface TrefleService {
                     @Query("filter[edible]") edible: String,
                     @Query("filter[vegetable]") vegetable: String,
                     @Query("filter[flower_color]") color: String,
-                    @Query("filter[scientific_name]") cien_name: String): Call<PlantListss>
+                    @Query("filter[scientific_name]") cien_name: String): Call<FlowersResponse>
 }
 
 //@Query("filter[id]") id: Int

Floradex20/app/src/main/java/com/example/floradex20/models/Data.kt → Floradex20/app/src/main/java/com/example/floradex20/models/Flower.kt

@@ -1,6 +1,6 @@
 package com.example.floradex20.models
 
-data class Data(
+data class Flower (
     val author: String,
     val bibliography: String,
     val common_name: String,
@@ -10,7 +10,7 @@ data class Data(
     val genus_id: Int,
     val id: Int,
     val image_url: String,
-    val links: Links,
+    val links: FlowerLinks,
     val rank: String,
     val scientific_name: String,
     val slug: String,

Floradex20/app/src/main/java/com/example/floradex20/models/Links.kt → Floradex20/app/src/main/java/com/example/floradex20/models/FlowerLinks.kt

@@ -1,6 +1,6 @@
 package com.example.floradex20.models
 
-data class Links(
+data class FlowerLinks (
     val genus: String,
     val plant: String,
     val self: String

Floradex20/app/src/main/java/com/example/floradex20/models/FlowersResponse.kt

@@ -0,0 +1,7 @@
+package com.example.floradex20.models
+
+data class FlowersResponse (
+    val `data`: List<Flower>,
+    val links: FlowersResponseLinks,
+    val meta: FlowersResponseMetadata
+)

Floradex20/app/src/main/java/com/example/floradex20/models/LinksX.kt → Floradex20/app/src/main/java/com/example/floradex20/models/FlowersResponseLinks.kt

@@ -1,6 +1,6 @@
 package com.example.floradex20.models
 
-data class LinksX(
+data class FlowersResponseLinks (
     val first: String,
     val last: String,
     val next: String,

Floradex20/app/src/main/java/com/example/floradex20/models/Meta.kt → Floradex20/app/src/main/java/com/example/floradex20/models/FlowersResponseMetadata.kt

@@ -1,5 +1,5 @@
 package com.example.floradex20.models
 
-data class Meta(
+data class FlowersResponseMetadata (
     val total: Int
 )

Floradex20/app/src/main/java/com/example/floradex20/models/PlantListss.kt

@@ -1,11 +0,0 @@
-package com.example.floradex20.models
-
-import com.example.floradex20.models.Data
-import com.example.floradex20.models.LinksX
-import com.example.floradex20.models.Meta
-
-data class PlantListss(
-    val `data`: List<Data>,
-    val links: LinksX,
-    val meta: Meta
-)

Floradex20/app/src/main/java/com/example/floradex20/models/User.kt

@@ -0,0 +1,11 @@
+package com.example.floradex20.models
+
+import com.google.gson.annotations.SerializedName
+
+data class User (
+   @SerializedName("username") val username: String?,
+   @SerializedName("email") val email: String?,
+   @SerializedName("password") val password: String?,
+   @SerializedName("id") val id: String?,
+   @SerializedName("error") val error: String?
+)

Floradex20/app/src/main/java/com/example/floradex20/models/UserInfo.kt

@@ -1,11 +0,0 @@
-package com.example.floradex20.models
-
-import com.google.gson.annotations.SerializedName
-
-data class UserInfo (
-        @SerializedName("username") val user_name: String?,
-        @SerializedName("email") val user_email: String?,
-        @SerializedName("password") val user_password: String?,
-        @SerializedName("id") val id: String?,
-        @SerializedName("error") val error: String?
-)

Floradex20/app/src/main/java/com/example/floradex20/services/ServiceBuilder.kt

@@ -0,0 +1,22 @@
+package com.example.floradex20.services
+
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+private const val TOKEN_ANDRES: String = "cMyugCJvk-U_xoi31FVBgoEqZiuRnDYpP8fv8Vfiejg"
+private const val BASE_URL = "https://ada.uprrp.edu/" // "https://trefle.io/"
+
+object ServiceBuilder {
+    private val client = OkHttpClient.Builder().build()
+
+    private val retrofit = Retrofit.Builder()
+        .baseUrl(BASE_URL)
+        .addConverterFactory(GsonConverterFactory.create())
+        .client(client)
+        .build()
+
+    fun<T> buildService(service: Class<T>): T{
+        return retrofit.create(service)
+    }
+}

Floradex20/app/src/main/res/layout/discover_activity.xml → Floradex20/app/src/main/res/layout/activity_discover.xml

@@ -5,7 +5,7 @@
     android:id="@+id/discover_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.MainActivity">
+    tools:context=".activities.RegisterActivity">
 
 
     <Button
@@ -37,8 +37,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_margin="20dp"
-        android:text="Floradex"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:text="Flowerdex"
         android:textSize="20sp" />
 
     <androidx.recyclerview.widget.RecyclerView

Floradex20/app/src/main/res/layout/ventanita.xml → Floradex20/app/src/main/res/layout/activity_flower_detail.xml

@@ -6,7 +6,7 @@
     android:id="@+id/Plant_info"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.MainActivity">
+    tools:context=".activities.RegisterActivity">
 
     <TextView
         android:id="@+id/author"

Floradex20/app/src/main/res/layout/layout.xml → Floradex20/app/src/main/res/layout/row_flower.xml

@@ -43,7 +43,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginTop="21dp"
                 android:layout_marginEnd="332dp"
-                app:srcCompat="@drawable/star" />
+                app:srcCompat="@drawable/star_empty" />
 
 
         </RelativeLayout>

Floradex20/app/src/main/res/values/strings.xml

@@ -1,11 +1,10 @@
 <resources>
-    <string name="app_name">Floradex20</string>
+    <string name="app_name">Flowerdex</string>
     <string name="TOKEN">-wNgf1Lzwh__BwM_7iGot107arhbUbkFtFsCWtZI8lY</string>
 
     <string name="BASE_URL">"https://trefle.io/"</string>
 
     <string name="plant_name">Plant Name</string>
-    <string name="testuri">TestUri</string>
     <string name="scientific_name">Scientific Name</string>
     <string name="year">Year</string>
     <string name="author">Author</string>
@@ -20,13 +19,8 @@
     <string name="not_vegetable">Not Vegetable</string>
     <string name="vegetable">Vegetable</string>
     <string name="apply">Apply</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="swipe_left_for_register">Swipe Left for Register</string>
-    <string name="login">Login</string>
     <string name="password">Password</string>
     <string name="e_mail">Email</string>
-    <string name="tag">Lets look at flowers</string>
-    <string name="swipe_right_for_login">Swipe Right for Login</string>
     <string name="register">Register</string>
     <string name="re_type_password">Re-type Password</string>
     <string name="your_name">Full Name</string>

Planta_Display/AndroidManifest.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.trefletest">
-
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>

Planta_Display/MainActivity.kt

@@ -1,81 +0,0 @@
-package com.example.trefletest
-
-import android.os.Bundle
-import android.widget.ImageView
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import com.example.trefletest.models.Plant
-import com.squareup.picasso.Picasso
-import okhttp3.OkHttpClient
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-private const val TOKEN = "cMyugCJvk-U_xoi31FVBgoEqZiuRnDYpP8fv8Vfiejg"
-private const val  BASE_URL = "https://trefle.io/"
-var slug: String = "prunella-vulgaris"
-
-object ServiceBuilder {
-
-    val client = OkHttpClient.Builder().build()
-
-    var retrofit: Retrofit = Retrofit.Builder()
-        .baseUrl(BASE_URL)
-        .addConverterFactory(GsonConverterFactory.create())
-        .client(client)
-        .build()
-
-    fun <T> buildService(service: Class<T>): T {
-        return retrofit.create(service)
-    }
-}
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val nom_planta = findViewById(R.id.plant_name) as TextView
-        //val uri_test = findViewById(R.id.uri) as TextView   Por si acaso
-        val nom_sci = findViewById(R.id.sci_name) as TextView
-        val year = findViewById(R.id.year) as TextView
-        val author = findViewById(R.id.author) as TextView
-        val imagen_planta = findViewById(R.id.plantview) as ImageView
-
-        nom_planta.text = ("Loading...")
-        nom_sci.text = ("Loading...")
-        year.text = ("Loading...")
-        author.text = ("Loading...")
-
-        val request = ServiceBuilder.buildService(TrefleService::class.java)
-        val call = request.getPlants(slug, TOKEN)
-        val uri = call.request().url.toString()
-
-        //uri_test.text = (uri)
-
-        call.enqueue(object : Callback<Plant> {
-            override fun onFailure(call: Call<Plant>, t: Throwable) {
-                Toast.makeText(this@MainActivity, t.message, Toast.LENGTH_LONG).show()
-            }
-
-            override fun onResponse(call: Call<Plant>, response: Response<Plant>) {
-                if (response.isSuccessful) {
-                    val planta: Plant = response.body()!!
-                    nom_planta.text = planta.data.commonName.toString()
-                    nom_sci.text = planta.data.scientificName
-                    year.text = planta.data.year.toString()
-                    author.text = planta.data.author
-                    Picasso.get().load(planta.data.imageUrl).into(imagen_planta)
-                }
-                else{
-                    Toast.makeText(this@MainActivity, response.message(), Toast.LENGTH_LONG).show()
-                }
-
-            }
-        })
-
-    }
-
-}

Planta_Display/Plant.kt

@@ -1,468 +0,0 @@
-package com.example.trefletest.models
-import com.google.gson.annotations.SerializedName
-
-
-data class Plant(
-    @SerializedName("data")
-    val `data`: Data,
-    @SerializedName("meta")
-    val meta: Meta
-) {
-    data class Data(
-        @SerializedName("author")
-        val author: String,
-        @SerializedName("bibliography")
-        val bibliography: String,
-        @SerializedName("common_name")
-        val commonName: Any?,
-        @SerializedName("family")
-        val family: Family,
-        @SerializedName("family_common_name")
-        val familyCommonName: Any?,
-        @SerializedName("forms")
-        val forms: List<Any>,
-        @SerializedName("genus")
-        val genus: Genus,
-        @SerializedName("genus_id")
-        val genusId: Int,
-        @SerializedName("hybrids")
-        val hybrids: List<Any>,
-        @SerializedName("id")
-        val id: Int,
-        @SerializedName("image_url")
-        val imageUrl: String,
-        @SerializedName("links")
-        val links: Links,
-        @SerializedName("main_species")
-        val mainSpecies: MainSpecies,
-        @SerializedName("main_species_id")
-        val mainSpeciesId: Int,
-        @SerializedName("observations")
-        val observations: String,
-        @SerializedName("scientific_name")
-        val scientificName: String,
-        @SerializedName("slug")
-        val slug: String,
-        @SerializedName("sources")
-        val sources: List<Source>,
-        @SerializedName("species")
-        val species: List<Specy>,
-        @SerializedName("subspecies")
-        val subspecies: List<Any>,
-        @SerializedName("subvarieties")
-        val subvarieties: List<Any>,
-        @SerializedName("varieties")
-        val varieties: List<Any>,
-        @SerializedName("vegetable")
-        val vegetable: Boolean,
-        @SerializedName("year")
-        val year: Int
-    ) {
-        data class Family(
-            @SerializedName("common_name")
-            val commonName: Any?,
-            @SerializedName("id")
-            val id: Int,
-            @SerializedName("links")
-            val links: Links,
-            @SerializedName("name")
-            val name: String,
-            @SerializedName("slug")
-            val slug: String
-        ) {
-            data class Links(
-                @SerializedName("division_order")
-                val divisionOrder: String,
-                @SerializedName("genus")
-                val genus: String,
-                @SerializedName("self")
-                val self: String
-            )
-        }
-
-        data class Genus(
-            @SerializedName("id")
-            val id: Int,
-            @SerializedName("links")
-            val links: Links,
-            @SerializedName("name")
-            val name: String,
-            @SerializedName("slug")
-            val slug: String
-        ) {
-            data class Links(
-                @SerializedName("family")
-                val family: String,
-                @SerializedName("plants")
-                val plants: String,
-                @SerializedName("self")
-                val self: String,
-                @SerializedName("species")
-                val species: String
-            )
-        }
-
-        data class Links(
-            @SerializedName("genus")
-            val genus: String,
-            @SerializedName("self")
-            val self: String,
-            @SerializedName("species")
-            val species: String
-        )
-
-        data class MainSpecies(
-            @SerializedName("author")
-            val author: String,
-            @SerializedName("bibliography")
-            val bibliography: String,
-            @SerializedName("common_name")
-            val commonName: Any?,
-            @SerializedName("common_names")
-            val commonNames: CommonNames,
-            @SerializedName("distribution")
-            val distribution: Distribution,
-            @SerializedName("distributions")
-            val distributions: Distributions,
-            @SerializedName("duration")
-            val duration: Any?,
-            @SerializedName("edible")
-            val edible: Boolean,
-            @SerializedName("edible_part")
-            val ediblePart: Any?,
-            @SerializedName("family")
-            val family: String,
-            @SerializedName("family_common_name")
-            val familyCommonName: Any?,
-            @SerializedName("flower")
-            val flower: Flower,
-            @SerializedName("foliage")
-            val foliage: Foliage,
-            @SerializedName("fruit_or_seed")
-            val fruitOrSeed: FruitOrSeed,
-            @SerializedName("genus")
-            val genus: String,
-            @SerializedName("genus_id")
-            val genusId: Int,
-            @SerializedName("growth")
-            val growth: Growth,
-            @SerializedName("id")
-            val id: Int,
-            @SerializedName("image_url")
-            val imageUrl: String,
-            @SerializedName("images")
-            val images: Images,
-            @SerializedName("links")
-            val links: Links,
-            @SerializedName("observations")
-            val observations: String,
-            @SerializedName("rank")
-            val rank: String,
-            @SerializedName("scientific_name")
-            val scientificName: String,
-            @SerializedName("slug")
-            val slug: String,
-            @SerializedName("sources")
-            val sources: List<Source>,
-            @SerializedName("specifications")
-            val specifications: Specifications,
-            @SerializedName("status")
-            val status: String,
-            @SerializedName("synonyms")
-            val synonyms: List<Any>,
-            @SerializedName("vegetable")
-            val vegetable: Boolean,
-            @SerializedName("year")
-            val year: Int
-        ) {
-            class CommonNames(
-            )
-
-            data class Distribution(
-                @SerializedName("native")
-                val native: List<String>
-            )
-
-            data class Distributions(
-                @SerializedName("native")
-                val native: List<Native>
-            ) {
-                data class Native(
-                    @SerializedName("id")
-                    val id: Int,
-                    @SerializedName("links")
-                    val links: Links,
-                    @SerializedName("name")
-                    val name: String,
-                    @SerializedName("slug")
-                    val slug: String,
-                    @SerializedName("species_count")
-                    val speciesCount: Int,
-                    @SerializedName("tdwg_code")
-                    val tdwgCode: String,
-                    @SerializedName("tdwg_level")
-                    val tdwgLevel: Int
-                ) {
-                    data class Links(
-                        @SerializedName("plants")
-                        val plants: String,
-                        @SerializedName("self")
-                        val self: String,
-                        @SerializedName("species")
-                        val species: String
-                    )
-                }
-            }
-
-            data class Flower(
-                @SerializedName("color")
-                val color: Any?,
-                @SerializedName("conspicuous")
-                val conspicuous: Any?
-            )
-
-            data class Foliage(
-                @SerializedName("color")
-                val color: Any?,
-                @SerializedName("leaf_retention")
-                val leafRetention: Any?,
-                @SerializedName("texture")
-                val texture: Any?
-            )
-
-            data class FruitOrSeed(
-                @SerializedName("color")
-                val color: Any?,
-                @SerializedName("conspicuous")
-                val conspicuous: Any?,
-                @SerializedName("seed_persistence")
-                val seedPersistence: Any?,
-                @SerializedName("shape")
-                val shape: Any?
-            )
-
-            data class Growth(
-                @SerializedName("atmospheric_humidity")
-                val atmosphericHumidity: Any?,
-                @SerializedName("bloom_months")
-                val bloomMonths: Any?,
-                @SerializedName("days_to_harvest")
-                val daysToHarvest: Any?,
-                @SerializedName("description")
-                val description: Any?,
-                @SerializedName("fruit_months")
-                val fruitMonths: Any?,
-                @SerializedName("growth_months")
-                val growthMonths: Any?,
-                @SerializedName("light")
-                val light: Any?,
-                @SerializedName("maximum_precipitation")
-                val maximumPrecipitation: MaximumPrecipitation,
-                @SerializedName("maximum_temperature")
-                val maximumTemperature: MaximumTemperature,
-                @SerializedName("minimum_precipitation")
-                val minimumPrecipitation: MinimumPrecipitation,
-                @SerializedName("minimum_root_depth")
-                val minimumRootDepth: MinimumRootDepth,
-                @SerializedName("minimum_temperature")
-                val minimumTemperature: MinimumTemperature,
-                @SerializedName("ph_maximum")
-                val phMaximum: Any?,
-                @SerializedName("ph_minimum")
-                val phMinimum: Any?,
-                @SerializedName("row_spacing")
-                val rowSpacing: RowSpacing,
-                @SerializedName("soil_humidity")
-                val soilHumidity: Any?,
-                @SerializedName("soil_nutriments")
-                val soilNutriments: Any?,
-                @SerializedName("soil_salinity")
-                val soilSalinity: Any?,
-                @SerializedName("soil_texture")
-                val soilTexture: Any?,
-                @SerializedName("sowing")
-                val sowing: Any?,
-                @SerializedName("spread")
-                val spread: Spread
-            ) {
-                data class MaximumPrecipitation(
-                    @SerializedName("mm")
-                    val mm: Any?
-                )
-
-                data class MaximumTemperature(
-                    @SerializedName("deg_c")
-                    val degC: Any?,
-                    @SerializedName("deg_f")
-                    val degF: Any?
-                )
-
-                data class MinimumPrecipitation(
-                    @SerializedName("mm")
-                    val mm: Any?
-                )
-
-                data class MinimumRootDepth(
-                    @SerializedName("cm")
-                    val cm: Any?
-                )
-
-                data class MinimumTemperature(
-                    @SerializedName("deg_c")
-                    val degC: Any?,
-                    @SerializedName("deg_f")
-                    val degF: Any?
-                )
-
-                data class RowSpacing(
-                    @SerializedName("cm")
-                    val cm: Any?
-                )
-
-                data class Spread(
-                    @SerializedName("cm")
-                    val cm: Any?
-                )
-            }
-
-            data class Images(
-                @SerializedName("bark")
-                val bark: List<Any>,
-                @SerializedName("flower")
-                val flower: List<Flower>,
-                @SerializedName("fruit")
-                val fruit: List<Any>,
-                @SerializedName("habit")
-                val habit: List<Any>,
-                @SerializedName("leaf")
-                val leaf: List<Any>,
-                @SerializedName("other")
-                val other: List<Any>
-            ) {
-                data class Flower(
-                    @SerializedName("copyright")
-                    val copyright: String,
-                    @SerializedName("id")
-                    val id: Int,
-                    @SerializedName("image_url")
-                    val imageUrl: String
-                )
-            }
-
-            data class Links(
-                @SerializedName("genus")
-                val genus: String,
-                @SerializedName("plant")
-                val plant: String,
-                @SerializedName("self")
-                val self: String
-            )
-
-            data class Source(
-                @SerializedName("citation")
-                val citation: String?,
-                @SerializedName("id")
-                val id: String,
-                @SerializedName("last_update")
-                val lastUpdate: String,
-                @SerializedName("name")
-                val name: String,
-                @SerializedName("url")
-                val url: String
-            )
-
-            data class Specifications(
-                @SerializedName("average_height")
-                val averageHeight: AverageHeight,
-                @SerializedName("growth_form")
-                val growthForm: Any?,
-                @SerializedName("growth_habit")
-                val growthHabit: Any?,
-                @SerializedName("growth_rate")
-                val growthRate: Any?,
-                @SerializedName("ligneous_type")
-                val ligneousType: Any?,
-                @SerializedName("maximum_height")
-                val maximumHeight: MaximumHeight,
-                @SerializedName("nitrogen_fixation")
-                val nitrogenFixation: Any?,
-                @SerializedName("shape_and_orientation")
-                val shapeAndOrientation: Any?,
-                @SerializedName("toxicity")
-                val toxicity: Any?
-            ) {
-                data class AverageHeight(
-                    @SerializedName("cm")
-                    val cm: Any?
-                )
-
-                data class MaximumHeight(
-                    @SerializedName("cm")
-                    val cm: Any?
-                )
-            }
-        }
-
-        data class Source(
-            @SerializedName("citation")
-            val citation: String?,
-            @SerializedName("id")
-            val id: String,
-            @SerializedName("last_update")
-            val lastUpdate: String,
-            @SerializedName("name")
-            val name: String,
-            @SerializedName("url")
-            val url: String
-        )
-
-        data class Specy(
-            @SerializedName("author")
-            val author: String,
-            @SerializedName("bibliography")
-            val bibliography: String,
-            @SerializedName("common_name")
-            val commonName: Any?,
-            @SerializedName("family")
-            val family: String,
-            @SerializedName("family_common_name")
-            val familyCommonName: Any?,
-            @SerializedName("genus")
-            val genus: String,
-            @SerializedName("genus_id")
-            val genusId: Int,
-            @SerializedName("id")
-            val id: Int,
-            @SerializedName("image_url")
-            val imageUrl: String,
-            @SerializedName("links")
-            val links: Links,
-            @SerializedName("rank")
-            val rank: String,
-            @SerializedName("scientific_name")
-            val scientificName: String,
-            @SerializedName("slug")
-            val slug: String,
-            @SerializedName("status")
-            val status: String,
-            @SerializedName("synonyms")
-            val synonyms: List<Any>,
-            @SerializedName("year")
-            val year: Int
-        ) {
-            data class Links(
-                @SerializedName("genus")
-                val genus: String,
-                @SerializedName("plant")
-                val plant: String,
-                @SerializedName("self")
-                val self: String
-            )
-        }
-    }
-
-    data class Meta(
-        @SerializedName("last_modified")
-        val lastModified: String
-    )
-}

Planta_Display/TrefleService.kt

@@ -1,14 +0,0 @@
-package com.example.trefletest
-
-import com.example.trefletest.models.Plant
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-interface TrefleService {
-    @GET("/api/v1/plants/{id}")
-    fun getPlants(@Path("id") id: String, @Query("token") token: String): Call<Plant>
-}
-
-//@Query("filter[id]") id: Int

Planta_Display/activity_main.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/Plant_info"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:id="@+id/author"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/author"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.506"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/year"
-        app:layout_constraintVertical_bias="0.239" />
-
-    <TextView
-        android:id="@+id/sci_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/scientific_name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.507"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/plant_name"
-        app:layout_constraintVertical_bias="0.155" />
-
-    <TextView
-        android:id="@+id/plant_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/plant_name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.511"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.57" />
-
-    <TextView
-        android:id="@+id/year"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/year"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.506"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sci_name"
-        app:layout_constraintVertical_bias="0.186" />
-
-    <ImageView
-        android:id="@+id/plantview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/plant_display"
-        app:layout_constraintBottom_toTopOf="@+id/plant_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_launcher_foreground" />
-</androidx.constraintlayout.widget.ConstraintLayout>

Planta_Display/build.gradle

@@ -1,54 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    defaultConfig {
-        applicationId "com.example.trefletest"
-        minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
-        vectorDrawables{
-            useSupportLibrary true
-        }
-
-        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 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation "com.squareup.picasso:picasso:2.71828"
-    implementation "org.jetbrains.anko:anko-common:0.9"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
-}

Planta_Display/strings.xml

@@ -1,9 +0,0 @@
-<resources>
-    <string name="app_name">TrefleTest</string>
-    <string name="plant_name">Plant Name</string>
-    <string name="testuri">TestUri</string>
-    <string name="scientific_name">Scientific Name</string>
-    <string name="year">Year</string>
-    <string name="author">Author</string>
-    <string name="plant_display">Plant Display</string>
-</resources>

Planta_Display/styles.xml

@@ -1,10 +0,0 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

README.md

@@ -1,9 +1,6 @@
-Este es el repositorio para el proyecto Flowerdex. Los miembros somos Andrés, Víctor, José e Ismael.
-
-Falta subir todos los detalles y especificaciones.
+# Flowerdex
 
-Saludos, dice Andrés
-
-Jose puso esto
+Este es el repositorio para el proyecto Flowerdex. Los miembros somos Andrés, Víctor, José e Ismael.
 
-Andres ahora si modifico
+`Flowerdex` es el folder que contiene el código de iOS (Swift)
+`Floradex20` es el folder que contiene el código de Android (Kotlin)

README2.md

@@ -1 +0,0 @@
-esto es un nuevo test document