mirror of
https://github.com/Aviortheking/CA_Contest.git
synced 2025-04-22 19:02:13 +00:00
third view
This commit is contained in:
parent
f017563668
commit
eef796a7c7
@ -40,6 +40,7 @@ dependencies {
|
|||||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||||
implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
|
implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
|
||||||
implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
|
implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
|
||||||
|
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||||
testImplementation 'junit:junit:4.+'
|
testImplementation 'junit:junit:4.+'
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
|
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||||
|
@ -1,19 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.example.ca_contest">
|
package="com.example.ca_contest">
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
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
|
<activity
|
||||||
android:name=".CountrySelectorActivity"
|
android:name=".CountrySelectorActivity"
|
||||||
android:label="@string/title_activity_country_selector"
|
android:label="@string/title_activity_country_selector"
|
||||||
android:theme="@style/Theme.CA_Contest.NoActionBar"></activity>
|
android:theme="@style/Theme.CA_Contest.NoActionBar" />
|
||||||
<activity android:name=".MainActivity">
|
<activity android:name=".MainActivity">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
41
app/src/main/java/com/example/ca_contest/CalendarActivity.kt
Normal file
41
app/src/main/java/com/example/ca_contest/CalendarActivity.kt
Normal 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()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,7 @@
|
|||||||
package com.example.ca_contest.adapters
|
package com.example.ca_contest.adapters
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.util.Log
|
||||||
import com.example.ca_contest.R
|
import com.example.ca_contest.R
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
@ -8,6 +10,7 @@ import android.widget.ImageView
|
|||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.example.ca_contest.CalendarActivity
|
||||||
import com.example.ca_contest.api.Country
|
import com.example.ca_contest.api.Country
|
||||||
import com.squareup.picasso.Picasso
|
import com.squareup.picasso.Picasso
|
||||||
|
|
||||||
@ -61,9 +64,11 @@ class CountryAdapter(list: ArrayList<Country>) : RecyclerView.Adapter<CountryAda
|
|||||||
val context = itemView.context
|
val context = itemView.context
|
||||||
|
|
||||||
// Intent to Calendar
|
// Intent to Calendar
|
||||||
Toast.makeText(
|
context.startActivity(Intent(context, CalendarActivity::class.java)
|
||||||
context, name?.text, Toast.LENGTH_LONG
|
.putExtra("name", list[adapterPosition].name)
|
||||||
).show()
|
.putExtra("capital", list[adapterPosition].capital)
|
||||||
|
.putExtra("region", list[adapterPosition].region)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.example.ca_contest.api
|
package com.example.ca_contest.api
|
||||||
|
|
||||||
|
import android.widget.DatePicker
|
||||||
import com.google.gson.annotations.Expose
|
import com.google.gson.annotations.Expose
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
|
|
||||||
@ -17,5 +18,7 @@ data class Country(
|
|||||||
val region: String,
|
val region: String,
|
||||||
@Expose
|
@Expose
|
||||||
@SerializedName("alpha2Code")
|
@SerializedName("alpha2Code")
|
||||||
val alpha2Code: String
|
val alpha2Code: String,
|
||||||
|
|
||||||
|
val date: DatePicker
|
||||||
) {}
|
) {}
|
38
app/src/main/res/layout/activity_calendar.xml
Normal file
38
app/src/main/res/layout/activity_calendar.xml
Normal 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>
|
18
app/src/main/res/layout/toolbar.xml
Normal file
18
app/src/main/res/layout/toolbar.xml
Normal 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>
|
@ -7,4 +7,10 @@
|
|||||||
<color name="teal_700">#FF018786</color>
|
<color name="teal_700">#FF018786</color>
|
||||||
<color name="black">#FF000000</color>
|
<color name="black">#FF000000</color>
|
||||||
<color name="white">#FFFFFFFF</color>
|
<color name="white">#FFFFFFFF</color>
|
||||||
|
|
||||||
|
<style name="datepicker" parent="Theme.AppCompat.Light.Dialog">
|
||||||
|
<item name="colorPrimary">@color/purple_200</item>
|
||||||
|
<item name="colorPrimaryDark">@color/teal_200</item>
|
||||||
|
<item name="colorAccent">@color/black</item>
|
||||||
|
</style>
|
||||||
</resources>
|
</resources>
|
Loading…
x
Reference in New Issue
Block a user