Merge pull request #4 from Aviortheking/third_view

third view
This commit is contained in:
Florian Bouillon 2021-02-19 17:39:03 +01:00 committed by GitHub
commit f02b529405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 119 additions and 13 deletions

View File

@ -48,11 +48,9 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
// implementation 'androidx.recyclerview:recyclerview:1.1.0'
// implementation 'com.google.android.material:material:1.3.0'
// implementation 'androidx.preference:preference:1.1.1'
// implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
// implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

View File

@ -9,10 +9,14 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:usesCleartextTraffic="true"
android:theme="@style/Theme.CA_Contest">
android:theme="@style/Theme.CA_Contest"
android:usesCleartextTraffic="true">
<activity android:name=".CalendarActivity"></activity>
<activity
android:name=".CountrySelectorActivity"></activity>
android:name=".CountrySelectorActivity"
android:label="@string/title_activity_country_selector"
android:theme="@style/Theme.CA_Contest.NoActionBar" />
<activity android:name=".CountrySelectorActivity"></activity>
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@ -0,0 +1,41 @@
package com.example.ca_contest
import android.app.DatePickerDialog
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import android.view.View
import android.widget.DatePicker
import android.widget.Toast
import com.example.ca_contest.api.Country
import java.text.SimpleDateFormat
import java.util.*
class CalendarActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_calendar)
val name=intent.getStringExtra("name")
val capital=intent.getStringExtra("capital")
val region=intent.getStringExtra("region")
val datePicker = findViewById<DatePicker>(R.id.date)
val today = Calendar.getInstance()
datePicker.init(today.get(Calendar.YEAR), today.get(Calendar.MONTH),
today.get(Calendar.DAY_OF_MONTH)
) { view, year, month, day ->
val month = month + 1
}
fun addDate(view: View) {
// val listCountry: List<Country> = AppDatabaseHelper
// .getDatabase(this)
// .countryDAO()
// .insert()
}
}
}

View File

@ -1,5 +1,7 @@
package com.example.ca_contest.adapters
import android.content.Intent
import android.util.Log
import com.example.ca_contest.R
import android.view.LayoutInflater
import android.view.View
@ -8,6 +10,7 @@ import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast
import androidx.recyclerview.widget.RecyclerView
import com.example.ca_contest.CalendarActivity
import com.example.ca_contest.api.Country
import com.squareup.picasso.Picasso
@ -62,9 +65,11 @@ class CountryAdapter(list: ArrayList<Country>) : RecyclerView.Adapter<CountryAda
val context = itemView.context
// Intent to Calendar
Toast.makeText(
context, name?.text, Toast.LENGTH_LONG
).show()
context.startActivity(Intent(context, CalendarActivity::class.java)
.putExtra("name", list[adapterPosition].name)
.putExtra("capital", list[adapterPosition].capital)
.putExtra("region", list[adapterPosition].region)
)
}
}
}

View File

@ -1,5 +1,6 @@
package com.example.ca_contest.api
import android.widget.DatePicker
import com.google.gson.annotations.Expose
import com.google.gson.annotations.SerializedName
@ -18,5 +19,7 @@ data class Country(
val region: String,
@Expose
@SerializedName("alpha2Code")
val alpha2Code: String
val alpha2Code: String,
val date: DatePicker
) {}

View File

@ -0,0 +1,38 @@
<?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:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity = "center"
tools:context=".CalendarActivity">
<include layout="@layout/toolbar"/>
<DatePicker
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:datePickerMode="calendar"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:calendarTextColor="@color/purple_200">
</DatePicker>
<Button
android:id="@+id/add_date"
android:layout_width="0dp"
android:layout_height="50dp"
android:background="@color/purple_200"
android:onClick="addDate"
android:text="Valider"
android:textColor="@android:color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#123459"
android:id="@+id/toolbar">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="World Visit"
android:textSize="23sp"
android:textColor="@color/white">
</TextView>
</android.support.v7.widget.Toolbar>

View File

@ -9,5 +9,4 @@
<color name="white">#FFFFFFFF</color>
<color name="button">#CD4E61</color>
<color name="validation">#2ECB60</color>
</resources>