lo logramos bb. Login con el Discover Page, se conecta a Ada en vez de treffle, se organizaron los files, las flores tienen estrellitas, register y login funcionan

Floradex20/app/build.gradle

@@ -35,6 +35,7 @@ android {
 dependencies {
 
     //noinspection GradleCompatible
+    implementation 'org.jetbrains.anko:anko-common:0.9'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
@@ -44,7 +45,8 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.github.bumptech.glide:glide:4.10.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'//Glide
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.viewpager:viewpager:1.0.0'//Glide
     annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 //    implementation 'androidx.core:core-ktx:1.3.2'

Floradex20/app/src/main/AndroidManifest.xml

@@ -11,8 +11,17 @@
         android:roundIcon="@drawable/ic_launcher_foreground"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity
+            android:name=".activities.FilteringActivity"
+            android:parentActivityName=".activities.MainActivity" />
+        <activity
+            android:name=".activities.LoginActivity"
+            android:parentActivityName=".activities.MainActivity" />
+        <activity android:name=".activities.DiscoverActivity">
+<!--            android:parentActivityName=".activities.MainActivity">-->
 
-        <activity android:name=".MainActivity">
+        </activity>
+        <activity android:name=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -20,8 +29,8 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ventana"
-            android:parentActivityName=".MainActivity">
+            android:name=".activities.VentantaActivity"
+            android:parentActivityName=".activities.DiscoverActivity">
 
 
         </activity>

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

@@ -0,0 +1,113 @@
+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.google.android.material.snackbar.Snackbar
+import org.json.JSONObject
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class ApiManager(val parent: View) {
+
+
+    fun addUser(userData: UserInfo, onResult: (UserInfo?) -> Unit){
+        val retrofit = ServiceBuilder.buildService(RestApi::class.java)
+        retrofit.addUser(userData).enqueue(object: Callback<UserInfo> {
+            override fun onFailure(call: Call<UserInfo>, t: Throwable) {
+                Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
+            }
+            override fun onResponse(call: Call<UserInfo>, response: Response<UserInfo>) {
+                if(response.code() == 500 || response.code() == 400) {
+                    val responseString = response.errorBody()!!.string()
+                    val message = JSONObject(responseString).getString("error")
+                    Snackbar.make(parent, message, Snackbar.LENGTH_SHORT).show()
+                } else {
+                    onResult(response.body())
+                }
+            }
+        })
+    }
+
+
+    fun logInUser(userData: UserInfo, onResult: (UserInfo?) -> Unit) {
+        val retrofit = ServiceBuilder.buildService(RestApi::class.java)
+        retrofit.logInUser(userData).enqueue(object: Callback<UserInfo> {
+            override fun onFailure(call: Call<UserInfo>, t: Throwable) {
+                Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
+            }
+            override fun onResponse(call: Call<UserInfo>, response: Response<UserInfo>) {
+
+                if(response.code() == 500 || response.code() == 400) {
+                    val responseString = response.errorBody()!!.string()
+                    val message = JSONObject(responseString).getString("error")
+                    Snackbar.make(parent, message, Snackbar.LENGTH_SHORT).show()
+                } else {
+                    onResult(response.body())
+                }
+            }
+        })
+    }
+
+
+    fun getPlants(user_id: String, onResult: (PlantListss) -> Unit) {
+        val request = ServiceBuilder.buildService(RestApi::class.java)
+        request.getPlants(user_id).enqueue(object: Callback<PlantListss> {
+            override fun onFailure(call: Call<PlantListss>, t: Throwable) {
+                Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
+            }
+            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
+                if (response.code() == 500 || response.code() == 400) {
+                    val responseString = response.errorBody()!!.string()
+                    val message = JSONObject(responseString).getString("error")
+                    Snackbar.make(parent, message, Snackbar.LENGTH_SHORT).show()
+                } else {
+                    onResult(response.body()!!)
+                }
+            }
+        })
+    }
+
+    fun getPlantsByName(user_id: String, search_input: String, onResult: (PlantListss) -> 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) {
+                Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
+            }
+            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
+                if (response.code() == 500 || response.code() == 400) {
+                    val responseString = response.errorBody()!!.string()
+                    val message = JSONObject(responseString).getString("error")
+                    Snackbar.make(parent, message, Snackbar.LENGTH_SHORT).show()
+                } else {
+                    onResult(response.body()!!)
+                }
+            }
+        })
+    }
+
+    fun getFiltered(user_id: String, edible: String, vegetable: String, color: String, scientificName: String, onResult: (PlantListss) -> 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) {
+                Snackbar.make(parent, "${t.message}", Snackbar.LENGTH_SHORT).show()
+            }
+            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
+                if (response.code() == 500 || response.code() == 400) {
+                    val responseString = response.errorBody()!!.string()
+                    val message = JSONObject(responseString).getString("error")
+                    Snackbar.make(parent, message, Snackbar.LENGTH_SHORT).show()
+                } else {
+                    onResult(response.body()!!)
+                }
+            }
+        })
+    }
+
+
+
+}

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

@@ -1,100 +0,0 @@
-package com.example.floradex20
-
-//import com.example.floradex20.R
-//import com.example.floradex20.Plant
-//import com.squareup.picasso.Picasso
-//import android.support.v4.app.FragmentActivity
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import okhttp3.OkHttpClient
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import androidx.constraintlayout.widget.ConstraintLayout
-
-
-//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"
-
-//Creo que mas cosas para que lleguen las flores
-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)
-    }
-}
-
-
-//Main Activity
-class MainActivity : AppCompatActivity(), FlowerAdapter.OnItemClickListener {
-    private lateinit var recyclerView: RecyclerView
-    private lateinit var plants: List<Data>
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        val request = ServiceBuilder.buildService(TrefleService::class.java)
-        val call : Call<PlantListss> = request.getPlants(getString(R.string.TOKEN))
-
-
-        //Esta parte hay que loop it para que haga mas de 1 request al API
-        call.enqueue(object : Callback<PlantListss> {
-            override fun onResponse(call: Call<PlantListss>, response: Response<PlantListss>) {
-
-                if (response.isSuccessful) {
-
-                    recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
-
-                    recyclerView.apply {
-
-                        setHasFixedSize(true)
-                        plants = response.body()!!.data
-                        adapter = FlowerAdapter(plants, this@MainActivity)
-                        layoutManager = LinearLayoutManager(this@MainActivity)
-
-                        //Aqui hay que chequiar si el API response llega bien
-                        recyclerView.setAdapter(adapter)
-                        recyclerView.setLayoutManager(layoutManager)
-                    }
-//
-                }
-            }
-
-            override fun onFailure(call: Call<PlantListss>, t: Throwable) {
-                Toast.makeText(this@MainActivity, "${t.message}", Toast.LENGTH_SHORT).show()
-            }
-        })
-        }
-
-    override fun onItemClick(position: Int){
-        //Empezar el activity de Jose
-        var plant_info = 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, ventana::class.java).apply {
-            putExtra("plant_info", plant_info)
-        }
-        startActivity(intent)
-        Log.i("Position", plant_info.get(0))
-    }
-
-}
-

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

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

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

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

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

@@ -1,20 +0,0 @@
-package com.example.floradex20
-
-import com.example.floradex20.PlantListss
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-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>
-
-}
-
-
-
-
-//@Query("filter[id]") id: Int

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

@@ -0,0 +1,176 @@
+package com.example.floradex20.activities
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.widget.Button
+import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
+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
+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
+
+
+    //Para desplegar el boton de filtro en Discover Page
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        val inflater: MenuInflater = menuInflater
+        inflater.inflate(R.menu.filter_menu, menu)
+        return true
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.discover_activity)
+
+        //Donde se guarda el input del search bar y el search button
+        val enterButton = findViewById<Button>(R.id.search_enter)
+        val input = findViewById<EditText>(R.id.search)
+
+        // Get user_id
+        val sharedPref: SharedPreferences = applicationContext.getSharedPreferences("user_info", Context.MODE_PRIVATE)
+        val userID = sharedPref.getString("user_id", "")!!
+        Log.i("preferences", userID)
+
+        // Get flowers with user_id
+//        val thisActivity = this@Discover_activity
+        val apimanager = ApiManager(findViewById(R.id.discover_activity))
+        apimanager.getPlants(userID) {
+            recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
+
+            recyclerView.apply {
+
+                setHasFixedSize(true)
+                plants = it.data
+                adapter = FlowerAdapter(plants, this@DiscoverActivity)
+                layoutManager = LinearLayoutManager(this@DiscoverActivity)
+
+                //Aqui hay que chequiar si el API response llega bien
+                recyclerView.setAdapter(adapter)
+                recyclerView.setLayoutManager(layoutManager)
+            }
+        }
+
+        //Esto se ejecuta cuando el usuario hace un search con el search bar
+        enterButton?.setOnClickListener {
+
+            search_input = input.text.toString()
+
+            apimanager.getPlantsByName(userID, search_input) {
+
+//                progress_bar.visibility = View.GONE
+                recyclerView.apply {
+//                    Log.i("velllllllllllllllllllll", response.body().toString())
+                    setHasFixedSize(true)
+                    plants = it.data
+                    adapter = FlowerAdapter(plants, this@DiscoverActivity)
+                    layoutManager = LinearLayoutManager(this@DiscoverActivity)
+
+                    recyclerView.setAdapter(adapter)
+                    recyclerView.setLayoutManager(layoutManager)
+                }
+            }
+
+        }
+    }
+
+    override fun onItemClick(position: Int){
+        //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 {
+            putExtra("plant_info", plantInfo)
+        }
+        startActivity(intent)
+        Log.i("Position", plantInfo.get(0))
+    }
+
+
+    //Esto es lo que se ejecuta cuando se preciona el boton de filter en el UI.
+    //Ejecuta Filtering.kt
+    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.filterIcon -> {
+            val intent = Intent(this, FilteringActivity::class.java)
+            startActivityForResult(intent, 1)
+            true
+        }
+
+        else -> {
+            super.onOptionsItemSelected(item)   //Error handling?
+        }
+    }
+
+    //Esta es la funcion que se ejecuta cuando se recibe los filtros de
+    //filtering.kt. Hace un call al api con los filtros.
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        val edible = data?.getStringExtra("edible").toString().toLowerCase()
+        val vegetable = data?.getStringExtra("vegetable").toString().toLowerCase()
+        val scientificName = data?.getStringExtra("cientifico").toString().toLowerCase()
+        val color = data?.getStringExtra("color").toString().toLowerCase()
+
+        // Get user_id
+        val sharedPref: SharedPreferences = applicationContext.getSharedPreferences("user_info", Context.MODE_PRIVATE)
+        val userID = sharedPref.getString("user_id", "")!!
+        Log.i("preferences", userID)
+
+        // Get flowers (with filters)
+        val apiManager = ApiManager(findViewById(R.id.discover_activity))
+        apiManager.getFiltered(userID, edible, vegetable, color, scientificName) {
+
+            recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
+
+            recyclerView.apply {
+
+                setHasFixedSize(true)
+                plants = it.data
+                adapter = FlowerAdapter(plants, this@DiscoverActivity)
+                layoutManager = LinearLayoutManager(this@DiscoverActivity)
+
+                //Aqui hay que chequiar si el API response llega bien
+                recyclerView.setAdapter(adapter)
+                recyclerView.setLayoutManager(layoutManager)
+            }
+        }
+
+    }
+
+}
+

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

@@ -0,0 +1,66 @@
+package com.example.floradex20.activities
+
+import android.app.Activity
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+import android.widget.ToggleButton
+import com.example.floradex20.R
+
+class FilteringActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_filtering)
+
+        title = "Filter"
+
+        val sciTxt = findViewById<EditText>(R.id.editTextNombreSci)
+        val colorTxt = findViewById<EditText>(R.id.editTextFlowerColor)
+        val edibleToggle = findViewById<ToggleButton>(R.id.toggleButtonEdible)
+        val vegetableToggle = findViewById<ToggleButton>(R.id.toggleButtonVegetable)
+        val apply = findViewById<Button>(R.id.buttonApply)
+
+        //Los filter values
+        var edible: String = ""
+        var vegetable: String = ""
+        var nom_cientifico: String = ""
+        var color_flor: String = ""
+
+        edibleToggle.setOnCheckedChangeListener{ _, isChecked ->
+            if (isChecked){
+                edible = "true"
+            }
+            else{
+                edible = "false"
+            }
+        }
+        vegetableToggle.setOnCheckedChangeListener{ _, isChecked ->
+            if (isChecked){
+                vegetable = "true"
+            }
+            else{
+                vegetable = "false"
+            }
+        }
+
+        //Cuando usuario le da apply se envia los filter values a main activity
+        apply.setOnClickListener(){
+
+            color_flor = colorTxt.text.toString()
+            nom_cientifico = sciTxt.text.toString()
+            //Log.d("variables", edible + vegetable + nom_cientifico + color_flor)
+
+            val returnIntent = Intent()
+            returnIntent.putExtra("edible", edible)
+            returnIntent.putExtra("vegetable", vegetable)
+            returnIntent.putExtra("cientifico", nom_cientifico)
+            returnIntent.putExtra("color", color_flor)
+
+            //Log.d("retintent", returnIntent.toString())
+            setResult(Activity.RESULT_OK, returnIntent)
+            finish()
+        }
+    }
+}

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

@@ -1,12 +1,13 @@
-package com.example.floradex20
+package com.example.floradex20.activities
 
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 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.squareup.picasso.Picasso
 
 

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

@@ -0,0 +1,91 @@
+package com.example.floradex20.activities
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.widget.Button
+import android.widget.EditText
+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.login.ApiManager
+//import com.example.login.UserInfo
+import com.google.android.material.snackbar.Snackbar
+
+class LoginActivity: AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.login)
+
+
+        val b: Button
+        val user_email: EditText
+        val user_password: EditText
+        val login: String
+        val password: String
+        val email: String
+        user_email = findViewById(R.id.email)
+        user_password = findViewById(R.id.password)
+        email = user_email.getText().toString()
+        password = user_password.getText().toString()
+
+
+        val button: Button = findViewById(R.id.login_button)
+
+
+        //Coger estas cosas y mandarlas a la base de datos
+        button.setOnClickListener {
+            //Somehow hacer que esto llegue a la base de datos
+
+            val user_email: String = (findViewById(R.id.email) as TextView).getText().toString()
+            val user_password: String = (findViewById(R.id.password) as TextView).getText().toString()
+//            val user_password_confirm: String = (findViewById(R.id.et_repassword) as TextView).getText().toString()
+
+
+            //Hasta aqui funciona
+            val user_info = UserInfo(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) }
+//            user_info.user_password?.let { it1 -> Log.i("check instance info", it1) }
+
+            if(user_email == "" || user_password == ""){
+                Snackbar.make(
+                        it, "All Fields Required",
+                        Snackbar.LENGTH_LONG
+                ).setAction("Action", null).show()
+            }
+            else {
+                //
+                apimanager.logInUser(user_info) {
+
+                    Snackbar.make(
+                            thisActivity, "Succesfully logged in",
+                            Snackbar.LENGTH_LONG
+                    ).setAction("Action", null).show()
+
+                    val user_id: String? = it?.id
+//                    val user_name: String? = it?.user_name
+                    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.apply()
+
+
+                    //Guardar Id y mover a discover page
+
+                    val intent = Intent(this, DiscoverActivity::class.java)
+                    startActivity(intent)
+                }
+
+            }
+        }
+
+    }
+
+}

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

@@ -0,0 +1,132 @@
+package com.example.floradex20.activities
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+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.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() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.register)
+
+        val sharedPref: SharedPreferences = applicationContext.getSharedPreferences("user_info", Context.MODE_PRIVATE)
+
+        if(sharedPref.getString("user_id", "no se")!! != "no se"){
+            val intent = Intent(this, DiscoverActivity::class.java)
+            startActivity(intent)
+            return
+        }
+        Log.i("preferences", sharedPref.getString("user_id", "no se").toString())
+        //Boton para el usuario que ya se registro
+        val log_in_button: Button = findViewById(R.id.to_login_activity)
+
+        //Si el usuario ya se registro abre un intent para hacer login
+        log_in_button.setOnClickListener {
+//            Log.i("Debug", "Desde el clicl del register thing")
+            val intent = Intent(this, LoginActivity::class.java)
+            startActivity(intent)
+
+        }
+
+        //Boton para registrar usuario
+        val register_button: Button = findViewById(R.id.btn_register)
+
+        //cuando quickear el register button
+        register_button.setOnClickListener {
+
+            //Extrae los fields
+            val full_name: String =  (findViewById(R.id.et_name) as TextView).getText().toString()
+            val user_email: String = (findViewById(R.id.et_email) as TextView).getText().toString()
+            val user_password: String = (findViewById(R.id.et_password) as TextView).getText().toString()
+            val user_password_confirm: String = (findViewById(R.id.et_repassword) as TextView).getText().toString()
+
+            //Verifica que no esten vacios
+            if(full_name == "" || user_email == "" || user_password == "" || user_password_confirm == ""){
+                Snackbar.make(
+                        it, "All Fields Required",
+                        Snackbar.LENGTH_LONG
+                ).setAction("Action", null).show()
+            }
+
+            //Verifica que passwords match
+            else if(user_password != user_password_confirm){
+                Snackbar.make(
+                        it, "Passwords don't match",
+                        Snackbar.LENGTH_LONG
+                ).setAction("Action", null).show()
+            }
+
+            //Manda el info a la base de datos
+            else {
+
+                val user_info = UserInfo(full_name, user_email, user_password, null, null)
+                val apimanager = ApiManager(it)
+                val thisActivity = it
+
+                //Manda el info al
+                apimanager.addUser(user_info) {
+
+                    Snackbar.make(
+                            thisActivity, "Succesfully registered",
+                            Snackbar.LENGTH_LONG
+                    ).setAction("Action", null).show()
+
+                    //Se guarda el username y id
+                    val user_id: String? = it?.id
+                    val user_name: String? = it?.user_name
+                    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.apply()
+
+
+                    //Guardar Id y mover a discover page
+
+                    val intent = Intent(this, DiscoverActivity::class.java)
+                    startActivity(intent)
+
+                }
+
+            }
+
+
+        }
+
+    }
+
+
+}

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

@@ -1,14 +1,14 @@
-package com.example.floradex20
+package com.example.floradex20.activities
 
-import android.content.res.Configuration
 import android.os.Bundle
 import android.util.Log
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import com.example.floradex20.R
 import com.squareup.picasso.Picasso
 
-class ventana(): AppCompatActivity() {
+class VentantaActivity(): AppCompatActivity() {
 
 //    val planta:Data = plant
     override fun onCreate(savedInstanceState: Bundle?) {

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

@@ -0,0 +1,36 @@
+package com.example.floradex20.interfaces
+
+import com.example.floradex20.models.PlantListss
+import com.example.floradex20.models.UserInfo
+import retrofit2.Call
+import retrofit2.http.*
+
+interface RestApi {
+
+    @Headers("Content-Type: application/json")
+    @POST("~victor.hernandez17/flowerdex/signup.php")
+    fun addUser(@Body userData: UserInfo): Call<UserInfo>
+
+    @Headers("Content-Type: application/json")
+    @POST("~victor.hernandez17/flowerdex/login.php")
+    fun logInUser(@Body UserData: UserInfo): Call<UserInfo>
+
+
+    @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>
+
+    //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>
+
+    //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>
+}

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

@@ -0,0 +1,28 @@
+package com.example.floradex20.interfaces
+
+import com.example.floradex20.models.PlantListss
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+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>
+
+    //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>
+
+    //Api query para el filter
+    @GET("api/v1/plants/")
+    fun getFiltered(@Query("token") token: String,
+                    @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[id]") id: Int

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

@@ -1,4 +1,4 @@
-package com.example.floradex20
+package com.example.floradex20.models
 
 data class Data(
     val author: String,
@@ -16,5 +16,7 @@ data class Data(
     val slug: String,
     val status: String,
     val synonyms: List<String>,
-    val year: Int
+    val year: Int,
+    val isFavorite: Boolean,
+    val hasBeenFound: Boolean
 )

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

@@ -1,4 +1,4 @@
-package com.example.floradex20
+package com.example.floradex20.models
 
 data class Links(
     val genus: String,

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

@@ -1,4 +1,4 @@
-package com.example.floradex20
+package com.example.floradex20.models
 
 data class LinksX(
     val first: String,

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

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

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

@@ -0,0 +1,11 @@
+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/UserInfo.kt

@@ -0,0 +1,11 @@
+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/res/drawable-v24/filter.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FAFAFA"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
+</vector>

Floradex20/app/src/main/res/layout/activity_filtering.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.FilteringActivity">
+
+
+    <EditText
+        android:id="@+id/editTextNombreSci"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="153dp"
+        android:ems="10"
+        android:hint="@string/nombre_sci"
+        android:inputType="textPersonName"
+        android:importantForAutofill="no" />
+
+    <EditText
+        android:id="@+id/editTextFlowerColor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="441dp"
+        android:ems="10"
+        android:hint="@string/flower_color"
+        android:importantForAutofill="no"
+        android:inputType="textPersonName" />
+
+    <ToggleButton
+        android:id="@+id/toggleButtonEdible"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="315dp"
+        android:textOff="@string/not_edible"
+        android:textOn="@string/edible" />
+
+    <ToggleButton
+        android:id="@+id/toggleButtonVegetable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/toggleButtonEdible"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="26dp"
+        android:layout_marginBottom="294dp"
+        android:textOff="@string/not_vegetable"
+        android:textOn="@string/vegetable" />
+
+    <Button
+        android:id="@+id/buttonApply"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="159dp"
+        android:text="@string/apply" />
+
+</RelativeLayout>

Floradex20/app/src/main/res/layout/activity_main.xml

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-    <TextView
-        android:layout_centerHorizontal="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Floradex"
-        android:layout_margin="20dp"
-        android:id="@+id/title"
-        android:textSize="20sp"/>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:layout_below="@+id/title" />
-
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:scaleY="4"
-        android:indeterminateTint="@color/purple_200"
-        android:indeterminateBehavior="repeat"
-        android:indeterminate="true" />
-</RelativeLayout>
-
-    <!--<?xml version="1.0" encoding="utf-8"?>-->
-<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
-<!--    android:layout_width="match_parent"-->
-<!--    android:layout_height="match_parent"-->
-<!--    android:orientation="vertical" >-->
-<!--    <TextView android:id="@+id/text"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:text="Hello, I am a TextView" />-->
-<!--    <Button android:id="@+id/button"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:text="Hello, I am a Button" />-->
-<!--</LinearLayout>-->
-
-<!--<android.support.v7.widget.RecyclerView android:id="@+id/my_recycler_view"-->
-<!--    android:scrollbars="vertical"-->
-<!--    android:layout_width="match_parent"-->
-<!--    android:layout_height="match_parent"-->
-<!--    layout_height="8"-->
-<!--    xmlns:android="http://schemas.android.com/apk/res/android" />-->
-
-
-
-<!--    <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>-->

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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/discover_activity"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activities.MainActivity">
+
+
+    <Button
+        android:id="@+id/search_enter"
+        android:layout_width="60dp"
+        android:layout_height="40dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="79dp"
+        android:layout_marginEnd="38dp"
+        android:text="@string/enter"
+        android:textSize="10sp" />
+
+
+    <EditText
+        android:id="@+id/search"
+        android:layout_width="200dp"
+        android:layout_height="40dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="77dp"
+        android:ems="10"
+        android:hint="@string/escriba_nombre_de_planta"
+        android:inputType="textPersonName"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="20dp"
+        android:text="Floradex"
+        android:textSize="20sp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/title"
+        android:layout_alignParentStart="true"
+        android:layout_marginTop="83dp"
+        android:layout_marginBottom="10dp" />
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:indeterminate="true"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateTint="@color/purple_200"
+        android:scaleY="4" />
+</RelativeLayout>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -35,6 +36,14 @@
                 android:textSize="15sp"
                 android:text="Flower Name "/>
 
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="26dp"
+                android:layout_height="21dp"
+                android:layout_alignParentEnd="true"
+                android:layout_marginTop="21dp"
+                android:layout_marginEnd="332dp"
+                app:srcCompat="@drawable/star" />
 
 
         </RelativeLayout>

Floradex20/app/src/main/res/layout/login.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+    <EditText
+        android:id="@+id/email"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:hint="juan.delpueblo@upr.edu"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:padding="15dp"
+        android:inputType="textEmailAddress"
+        android:layout_above="@id/password"
+        android:textSize="15sp" />
+
+    <EditText
+        android:id="@+id/password"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:hint="password"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp"
+        android:padding="15dp"
+        android:inputType="textPassword"
+        android:layout_centerInParent="true"
+        android:textSize="15sp" />
+
+    <Button
+        android:id="@+id/login_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/password"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="15dp"
+        android:textColor="@android:color/white"
+        android:text="Log In"/>
+
+</RelativeLayout>

Floradex20/app/src/main/res/layout/register.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+<!--    tools:context=".RegisterFragment">-->
+
+    <TextView
+        android:id="@+id/tv_logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/register"
+        android:textAlignment="center"
+        android:textSize="50sp"
+        android:layout_marginStart="25dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginTop="60dp"/>
+
+    <EditText
+        android:id="@+id/et_name"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:hint="@string/your_name"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="10dp"
+        android:padding="15dp"
+        android:inputType="textPersonName"
+        android:textSize="15sp" />
+
+    <EditText
+        android:id="@+id/et_email"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:hint="@string/e_mail"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="10dp"
+        android:padding="15dp"
+        android:inputType="textEmailAddress"
+        android:textSize="15sp" />
+
+    <EditText
+        android:id="@+id/et_password"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:hint="@string/password"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="10dp"
+        android:padding="15dp"
+        android:inputType="textPassword"
+        android:textSize="15sp" />
+
+    <EditText
+        android:id="@+id/et_repassword"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:hint="@string/re_type_password"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:padding="15dp"
+        android:inputType="textPassword"
+        android:textSize="15sp" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <Button
+            android:id="@+id/btn_register"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="30dp"
+            android:layout_centerInParent="true"
+            android:textColor="@android:color/white"
+            android:text="@string/register"/>
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_above="@id/to_login_activity"
+            android:layout_centerHorizontal="true"/>
+
+        <Button
+            android:id="@+id/to_login_activity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Already registered?"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="20dp"/>
+
+    </RelativeLayout>
+
+</LinearLayout>

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

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

Floradex20/app/src/main/res/menu/filter_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id = "@+id/filterIcon"
+        android:icon= "@drawable/filter"
+        android:title= "@string/filter_menu"
+        app:showAsAction="ifRoom" />
+</menu>

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

@@ -10,5 +10,25 @@
     <string name="year">Year</string>
     <string name="author">Author</string>
     <string name="plant_display">Plant Display</string>
+    <string name="enter">Enter</string>
+    <string name="escriba_nombre_de_planta">Search for plant</string>
+    <string name="filter_menu">Filter Menu</string>
+    <string name="nombre_sci">Scientific Name</string>
+    <string name="edible">Edible</string>
+    <string name="flower_color">Flower Color</string>
+    <string name="not_edible">Not Edible</string>
+    <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>
 
 </resources>