diff --git a/app/build.gradle b/app/build.gradle index dc8b799..82ad5f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21da455..c96dcf3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -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"> + + android:name=".CountrySelectorActivity" + android:label="@string/title_activity_country_selector" + android:theme="@style/Theme.CA_Contest.NoActionBar" /> + diff --git a/app/src/main/java/com/example/ca_contest/CalendarActivity.kt b/app/src/main/java/com/example/ca_contest/CalendarActivity.kt new file mode 100644 index 0000000..a72dccb --- /dev/null +++ b/app/src/main/java/com/example/ca_contest/CalendarActivity.kt @@ -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(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 = AppDatabaseHelper +// .getDatabase(this) +// .countryDAO() +// .insert() + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ca_contest/adapters/CountryAdapter.kt b/app/src/main/java/com/example/ca_contest/adapters/CountryAdapter.kt index d9ca0a9..4dcd077 100644 --- a/app/src/main/java/com/example/ca_contest/adapters/CountryAdapter.kt +++ b/app/src/main/java/com/example/ca_contest/adapters/CountryAdapter.kt @@ -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) : RecyclerView.Adapter + + + + + + + + +