diff --git a/WeatherInfo/.gitignore b/WeatherInfo/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..aa724b77071afcbd9bb398053e05adaf7ac9405a --- /dev/null +++ b/WeatherInfo/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/WeatherInfo/.idea/.gitignore b/WeatherInfo/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/WeatherInfo/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/WeatherInfo/.idea/compiler.xml b/WeatherInfo/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..fb7f4a8a465d42b4a0390d464b83b99e8465bba7 --- /dev/null +++ b/WeatherInfo/.idea/compiler.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <bytecodeTargetLevel target="11" /> + </component> +</project> \ No newline at end of file diff --git a/WeatherInfo/.idea/gradle.xml b/WeatherInfo/.idea/gradle.xml new file mode 100644 index 0000000000000000000000000000000000000000..a2d7c21338e98a66cd8af9e352f293e52324608b --- /dev/null +++ b/WeatherInfo/.idea/gradle.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GradleMigrationSettings" migrationVersion="1" /> + <component name="GradleSettings"> + <option name="linkedExternalProjectsSettings"> + <GradleProjectSettings> + <option name="testRunner" value="GRADLE" /> + <option name="distributionType" value="DEFAULT_WRAPPED" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="modules"> + <set> + <option value="$PROJECT_DIR$" /> + <option value="$PROJECT_DIR$/app" /> + </set> + </option> + </GradleProjectSettings> + </option> + </component> +</project> \ No newline at end of file diff --git a/WeatherInfo/.idea/misc.xml b/WeatherInfo/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..bdd92780c2e1701133445c454990531e8a3688b6 --- /dev/null +++ b/WeatherInfo/.idea/misc.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/build/classes" /> + </component> + <component name="ProjectType"> + <option name="id" value="Android" /> + </component> +</project> \ No newline at end of file diff --git a/WeatherInfo/.idea/vcs.xml b/WeatherInfo/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c0b8635858dc7ad44b93df54b762707ce49eefc --- /dev/null +++ b/WeatherInfo/.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> \ No newline at end of file diff --git a/WeatherInfo/app/.gitignore b/WeatherInfo/app/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..42afabfd2abebf31384ca7797186a27a4b7dbee8 --- /dev/null +++ b/WeatherInfo/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/WeatherInfo/app/build.gradle b/WeatherInfo/app/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..afb075385e2100ffb84287f11200d95848d72a9c --- /dev/null +++ b/WeatherInfo/app/build.gradle @@ -0,0 +1,54 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'hu.bme.aut.android.weatherinfo' + compileSdk 32 + + defaultConfig { + applicationId "hu.bme.aut.android.weatherinfo" + minSdk 30 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + viewBinding true + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + def retrofit_version = "2.9.0" + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + def glide_version = "4.14.2" + implementation "com.github.bumptech.glide:glide:$glide_version" + annotationProcessor "com.github.bumptech.glide:compiler:$glide_version" +} \ No newline at end of file diff --git a/WeatherInfo/app/proguard-rules.pro b/WeatherInfo/app/proguard-rules.pro new file mode 100644 index 0000000000000000000000000000000000000000..481bb434814107eb79d7a30b676d344b0df2f8ce --- /dev/null +++ b/WeatherInfo/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/WeatherInfo/app/src/androidTest/java/hu/bme/aut/android/weatherinfo/ExampleInstrumentedTest.kt b/WeatherInfo/app/src/androidTest/java/hu/bme/aut/android/weatherinfo/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..ebadc5a91644e14a6e611dd5e8f33cfc77ed251c --- /dev/null +++ b/WeatherInfo/app/src/androidTest/java/hu/bme/aut/android/weatherinfo/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package hu.bme.aut.android.weatherinfo + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("hu.bme.aut.android.weatherinfo", appContext.packageName) + } +} \ No newline at end of file diff --git a/WeatherInfo/app/src/main/AndroidManifest.xml b/WeatherInfo/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000000000000000000000000000000..acaa5235e12d5ad68e2df5e3bf7e55ac10cd3f1e --- /dev/null +++ b/WeatherInfo/app/src/main/AndroidManifest.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + + <application + android:allowBackup="true" + android:dataExtractionRules="@xml/data_extraction_rules" + android:fullBackupContent="@xml/backup_rules" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/Theme.WeatherInfo" + tools:targetApi="31"> + <activity + android:name=".feature.details.DetailsActivity" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + + <meta-data + android:name="android.app.lib_name" + android:value="" /> + </activity> + </application> + + <uses-permission android:name="android.permission.INTERNET" /> + +</manifest> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/AddCityDialogFragment.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/AddCityDialogFragment.kt new file mode 100644 index 0000000000000000000000000000000000000000..f3c5f3847100e64462825c318edf6d5eb06d4e8a --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/AddCityDialogFragment.kt @@ -0,0 +1,41 @@ +package hu.bme.aut.android.weatherinfo.feature.city + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatDialogFragment +import hu.bme.aut.android.weatherinfo.R +import hu.bme.aut.android.weatherinfo.databinding.DialogNewCityBinding + +class AddCityDialogFragment : AppCompatDialogFragment() { + + private lateinit var binding: DialogNewCityBinding + private lateinit var listener: AddCityDialogListener + + interface AddCityDialogListener { + fun onCityAdded(city: String?) + } + + override fun onAttach(context: Context) { + super.onAttach(context) + binding = DialogNewCityBinding.inflate(LayoutInflater.from(context)) + + listener = context as? AddCityDialogListener + ?: throw RuntimeException("Activity must implement the AddCityDialogListener interface!") + } + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { //cax1rr + return AlertDialog.Builder(requireContext()) + .setTitle(R.string.new_city) + .setView(binding.root) + .setPositiveButton(R.string.ok) { _, _ -> + listener.onCityAdded( + binding.NewCityDialogEditText.text.toString() + ) + } + .setNegativeButton(R.string.cancel, null) + .create() + } +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/CityActivity.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/CityActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..c60f8e054ff35f3c41e0569c8a8b3c1c2aff2ac0 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/CityActivity.kt @@ -0,0 +1,50 @@ +package hu.bme.aut.android.weatherinfo.feature.city + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.recyclerview.widget.LinearLayoutManager +import hu.bme.aut.android.weatherinfo.databinding.ActivityCityBinding +import hu.bme.aut.android.weatherinfo.feature.details.DetailsActivity + +class CityActivity : AppCompatActivity(), CityAdapter.OnCitySelectedListener, + AddCityDialogFragment.AddCityDialogListener { + + private lateinit var binding: ActivityCityBinding + private lateinit var adapter: CityAdapter + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityCityBinding.inflate(layoutInflater) + setContentView(binding.root) + initFab() + initRecyclerView() + } + + private fun initFab() { + binding.fab.setOnClickListener { + AddCityDialogFragment().show(supportFragmentManager, AddCityDialogFragment::class.java.simpleName) + } + } + + private fun initRecyclerView() { + binding.mainRecyclerView.layoutManager = LinearLayoutManager(this) + adapter = CityAdapter(this) + adapter.addCity("Budapest") + adapter.addCity("Debrecen") + adapter.addCity("Sopron") + adapter.addCity("Szeged") + binding.mainRecyclerView.adapter = adapter + } + + override fun onCitySelected(city: String?) { + val showDetailsIntent = Intent() + showDetailsIntent.setClass(this@CityActivity, DetailsActivity::class.java) + showDetailsIntent.putExtra(DetailsActivity.EXTRA_CITY_NAME, city) + startActivity(showDetailsIntent) + } + + override fun onCityAdded(city: String?) { + adapter.addCity(city!!) + } +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/CityAdapter.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/CityAdapter.kt new file mode 100644 index 0000000000000000000000000000000000000000..a2317b5f8e1d140b57b5570b1334886bd9f915f2 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/city/CityAdapter.kt @@ -0,0 +1,55 @@ +package hu.bme.aut.android.weatherinfo.feature.city + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import hu.bme.aut.android.weatherinfo.R +import hu.bme.aut.android.weatherinfo.databinding.ItemCityBinding + +class CityAdapter(private val listener: OnCitySelectedListener) : RecyclerView.Adapter<CityAdapter.CityViewHolder>() { + private val cities: MutableList<String> = ArrayList() + + interface OnCitySelectedListener { + fun onCitySelected(city: String?) + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CityViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.item_city, parent, false) + return CityViewHolder(view) + } + + override fun onBindViewHolder(holder: CityViewHolder, position: Int) { + val item = cities[position] + holder.bind(item) + } + + override fun getItemCount(): Int = cities.size + + fun addCity(newCity: String) { + cities.add(newCity) + notifyItemInserted(cities.size - 1) + } + + fun removeCity(position: Int) { + cities.removeAt(position) + notifyItemRemoved(position) + if (position < cities.size) { + notifyItemRangeChanged(position, cities.size - position) + } + } + + inner class CityViewHolder(private val itemView: View) : RecyclerView.ViewHolder(itemView) { + var binding = ItemCityBinding.bind(itemView) + var item: String? = null + + init { + binding.root.setOnClickListener { listener.onCitySelected(item) } + } + + fun bind(newCity: String?) { + item = newCity + binding.CityItemNameTextView.text = item + } + } +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsActivity.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..a3af2455b9dd7a8d010edd77a736fc25288b95bb --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsActivity.kt @@ -0,0 +1,96 @@ +package hu.bme.aut.android.weatherinfo.feature.details + +import android.os.Bundle +import android.util.Log +import android.view.MenuItem +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.tabs.TabLayoutMediator +import hu.bme.aut.android.weatherinfo.R +import hu.bme.aut.android.weatherinfo.databinding.ActivityDetailsBinding +import hu.bme.aut.android.weatherinfo.model.WeatherData +import hu.bme.aut.android.weatherinfo.network.NetworkManager +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class DetailsActivity : AppCompatActivity(), WeatherDataHolder { + + private var weatherData: WeatherData? = null + private lateinit var binding: ActivityDetailsBinding + private var city: String? = null + + companion object { + private const val TAG = "DetailsActivity" + const val EXTRA_CITY_NAME = "extra.city_name" + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityDetailsBinding.inflate(layoutInflater) + setContentView(binding.root) + + city = intent.getStringExtra(EXTRA_CITY_NAME) + + supportActionBar?.title = getString(R.string.weather, city) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + } + + override fun getWeatherData(): WeatherData? { + return weatherData + } + + override fun onResume() { + super.onResume() + val detailsPagerAdapter = DetailsPagerAdapter(this) + binding.mainViewPager.adapter = detailsPagerAdapter + + TabLayoutMediator(binding.tabLayout, binding.mainViewPager) { tab, position -> + tab.text = when(position) { + 0 -> getString(R.string.main) + 1 -> getString(R.string.details) + else -> "" + } + }.attach() + loadWeatherData() + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + if (item.itemId == android.R.id.home) { + finish() + return true + } + return super.onOptionsItemSelected(item) + } + + private fun loadWeatherData() { + NetworkManager.getWeather(city)?.enqueue(object : Callback<WeatherData?> { + override fun onResponse( + call: Call<WeatherData?>, + response: Response<WeatherData?> + ) { + Log.d(TAG, "onResponse: " + response.code()) + if (response.isSuccessful) { + displayWeatherData(response.body()) + } else { + Toast.makeText(this@DetailsActivity, "Error: " + response.message(), Toast.LENGTH_LONG).show() + } + } + + override fun onFailure( + call: Call<WeatherData?>, + throwable: Throwable + ) { + throwable.printStackTrace() + Toast.makeText(this@DetailsActivity, "Network request error occured, check LOG", Toast.LENGTH_LONG).show() + } + }) + } + + private fun displayWeatherData(receivedWeatherData: WeatherData?) { + weatherData = receivedWeatherData + val detailsPagerAdapter = DetailsPagerAdapter(this) + binding.mainViewPager.adapter = detailsPagerAdapter + } + +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsMainFragment.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsMainFragment.kt new file mode 100644 index 0000000000000000000000000000000000000000..4bd7572bd164f7e7b7c6dc285f69d0230fa17069 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsMainFragment.kt @@ -0,0 +1,51 @@ +package hu.bme.aut.android.weatherinfo.feature.details + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.bumptech.glide.Glide +import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions +import hu.bme.aut.android.weatherinfo.databinding.FragmentDetailsMainBinding + +class DetailsMainFragment : Fragment() { + + private lateinit var binding: FragmentDetailsMainBinding + private var weatherDataHolder: WeatherDataHolder? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + weatherDataHolder = if (activity is WeatherDataHolder) { + activity as WeatherDataHolder? + } else { + throw RuntimeException( + "Activity must implement WeatherDataHolder interface!" + ) + } + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { + binding = FragmentDetailsMainBinding.inflate(LayoutInflater.from(context)) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + if (weatherDataHolder?.getWeatherData() != null) { + displayWeatherData() + } + } + + private fun displayWeatherData() { + val weather = weatherDataHolder?.getWeatherData()?.weather?.first() + binding.tvMain.text = weather?.main + binding.tvDescription.text = weather?.description + + Glide.with(this) + .load("https://openweathermap.org/img/w/${weather?.icon}.png") + .transition(DrawableTransitionOptions().crossFade()) + .into(binding.ivIcon) + } +} + diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsMoreFragment.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsMoreFragment.kt new file mode 100644 index 0000000000000000000000000000000000000000..aacd917e0dbd230a726e8e1b51c3d57576263d2f --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsMoreFragment.kt @@ -0,0 +1,44 @@ +package hu.bme.aut.android.weatherinfo.feature.details + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import hu.bme.aut.android.weatherinfo.databinding.FragmentDetailsMoreBinding + +class DetailsMoreFragment : Fragment() { + + private lateinit var binding: FragmentDetailsMoreBinding + private var weatherDataHolder: WeatherDataHolder? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + weatherDataHolder = if (activity is WeatherDataHolder) { + activity as WeatherDataHolder? + } else { + throw RuntimeException("Activity must implement WeatherDataHolder interface!") + } + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + binding = FragmentDetailsMoreBinding.inflate(LayoutInflater.from(context)) + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + if (weatherDataHolder?.getWeatherData() != null) { + showWeatherData() + } + } + + private fun showWeatherData() { + val weatherData = weatherDataHolder!!.getWeatherData() + binding.tvTemperature.text = weatherData?.main?.temp.toString() + binding.tvMinTemp.text = weatherData?.main?.temp_min.toString() + binding.tvMaxTemp.text = weatherData?.main?.temp_max.toString() + binding.tvPressure.text = weatherData?.main?.pressure.toString() + binding.tvHumidity.text = weatherData?.main?.humidity.toString() + } +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsPagerAdapter.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsPagerAdapter.kt new file mode 100644 index 0000000000000000000000000000000000000000..edb746221a2670bfb4ad104c33cdd93470cbc2f1 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/DetailsPagerAdapter.kt @@ -0,0 +1,22 @@ +package hu.bme.aut.android.weatherinfo.feature.details + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.viewpager2.adapter.FragmentStateAdapter + +class DetailsPagerAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) { + + companion object { + private const val NUM_PAGES: Int = 2 + } + + override fun createFragment(position: Int): Fragment { + return when (position) { + 0 -> DetailsMainFragment() + 1 -> DetailsMoreFragment() + else -> DetailsMainFragment() + } + } + + override fun getItemCount(): Int = NUM_PAGES +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/WeatherDataHolder.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/WeatherDataHolder.kt new file mode 100644 index 0000000000000000000000000000000000000000..4c98266f76241e555d8909838c3378f060d925d4 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/feature/details/WeatherDataHolder.kt @@ -0,0 +1,7 @@ +package hu.bme.aut.android.weatherinfo.feature.details + +import hu.bme.aut.android.weatherinfo.model.WeatherData + +interface WeatherDataHolder { + fun getWeatherData(): WeatherData? +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Cloud.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Cloud.kt new file mode 100644 index 0000000000000000000000000000000000000000..4428fd4e454341b8d63f99ec0f23ec06ccec7af2 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Cloud.kt @@ -0,0 +1,5 @@ +package hu.bme.aut.android.weatherinfo.model + +data class Cloud ( + var all: Int = 0 +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Coord.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Coord.kt new file mode 100644 index 0000000000000000000000000000000000000000..467edf9ac32a0dd21e5781240b6179ab48db7a65 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Coord.kt @@ -0,0 +1,6 @@ +package hu.bme.aut.android.weatherinfo.model + +data class Coord ( + var lon: Float = 0f, + var lat: Float = 0f +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/MainWeatherData.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/MainWeatherData.kt new file mode 100644 index 0000000000000000000000000000000000000000..b81e8185f083bb77c72fea0e47909e520d677a1a --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/MainWeatherData.kt @@ -0,0 +1,9 @@ +package hu.bme.aut.android.weatherinfo.model + +data class MainWeatherData ( + val temp: Float = 0f, + val pressure: Float = 0f, + val humidity: Float = 0f, + val temp_min: Float = 0f, + val temp_max: Float = 0f +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Sys.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Sys.kt new file mode 100644 index 0000000000000000000000000000000000000000..7d582963159cd3f99f44ab935c35102cf8825a0d --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Sys.kt @@ -0,0 +1,9 @@ +package hu.bme.aut.android.weatherinfo.model + +data class Sys ( + var type: Int = 0, + var id: Int = 0, + var country: String? = null, + var sunrise: Int = 0, + var sunset: Int = 0 +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Weather.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Weather.kt new file mode 100644 index 0000000000000000000000000000000000000000..2db40837c037a9e1f991f36e24fed2c4a260a07d --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Weather.kt @@ -0,0 +1,8 @@ +package hu.bme.aut.android.weatherinfo.model + +data class Weather ( + val id: Long = 0, + val main: String? = null, + val description: String? = null, + val icon: String? = null +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/WeatherData.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/WeatherData.kt new file mode 100644 index 0000000000000000000000000000000000000000..2920838e8f1434057baed6b568f3bc2c48a2c18d --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/WeatherData.kt @@ -0,0 +1,17 @@ +package hu.bme.aut.android.weatherinfo.model + +data class WeatherData ( + var coord: Coord, + var weather: List<Weather>? = null, + var base: String, + var main: MainWeatherData? = null, + var visibility: Int, + var wind: Wind? = null, + var clouds: Cloud, + var dt: Int, + var sys: Sys, + var timezone: Int, + var id: Int, + var name: String, + var cod: Int +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Wind.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Wind.kt new file mode 100644 index 0000000000000000000000000000000000000000..0d6ed97fd72f0a0a85c1bc2a6acb0ad5a0c2ca59 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/model/Wind.kt @@ -0,0 +1,6 @@ +package hu.bme.aut.android.weatherinfo.model + +class Wind ( + val speed: Float = 0f, + val deg: Float = 0f +) diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/network/NetworkManager.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/network/NetworkManager.kt new file mode 100644 index 0000000000000000000000000000000000000000..b49bbfc77f6292055a0148baf9c50c1b7101b517 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/network/NetworkManager.kt @@ -0,0 +1,28 @@ +package hu.bme.aut.android.weatherinfo.network + +import hu.bme.aut.android.weatherinfo.model.WeatherData +import okhttp3.OkHttpClient +import retrofit2.Call +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +object NetworkManager { + private val retrofit: Retrofit + private val weatherApi: WeatherApi + + private const val SERVICE_URL = "https://api.openweathermap.org" + private const val APP_ID = "7e1c00edaabbd65efc5d6e2f57347ebb" + + init { + retrofit = Retrofit.Builder() + .baseUrl(SERVICE_URL) + .client(OkHttpClient.Builder().build()) + .addConverterFactory(GsonConverterFactory.create()) + .build() + weatherApi = retrofit.create(WeatherApi::class.java) + } + + fun getWeather(city: String?): Call<WeatherData?>? { + return weatherApi.getWeather(city, "metric", APP_ID) + } +} diff --git a/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/network/WeatherApi.kt b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/network/WeatherApi.kt new file mode 100644 index 0000000000000000000000000000000000000000..5848437ee9374b7d740c87e80ab40788d5cfc1f9 --- /dev/null +++ b/WeatherInfo/app/src/main/java/hu/bme/aut/android/weatherinfo/network/WeatherApi.kt @@ -0,0 +1,15 @@ +package hu.bme.aut.android.weatherinfo.network + +import hu.bme.aut.android.weatherinfo.model.WeatherData +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query + +interface WeatherApi { + @GET("/data/2.5/weather") + fun getWeather( + @Query("q") cityName: String?, + @Query("units") units: String?, + @Query("appid") appId: String? + ): Call<WeatherData?>? +} diff --git a/WeatherInfo/app/src/main/res/drawable-hdpi/ic_add_white_36dp.png b/WeatherInfo/app/src/main/res/drawable-hdpi/ic_add_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1e5367b94b102288f62870d0c4a20b02b1dc5b98 Binary files /dev/null and b/WeatherInfo/app/src/main/res/drawable-hdpi/ic_add_white_36dp.png differ diff --git a/WeatherInfo/app/src/main/res/drawable-mdpi/ic_add_white_36dp.png b/WeatherInfo/app/src/main/res/drawable-mdpi/ic_add_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..481643ecd5e5c361bdf5440f80b6ead58c015a87 Binary files /dev/null and b/WeatherInfo/app/src/main/res/drawable-mdpi/ic_add_white_36dp.png differ diff --git a/WeatherInfo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/WeatherInfo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..2b068d11462a4b96669193de13a711a3a36220a0 --- /dev/null +++ b/WeatherInfo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> + <aapt:attr name="android:fillColor"> + <gradient + android:endX="85.84757" + android:endY="92.4963" + android:startX="42.9492" + android:startY="49.59793" + android:type="linear"> + <item + android:color="#44000000" + android:offset="0.0" /> + <item + android:color="#00000000" + android:offset="1.0" /> + </gradient> + </aapt:attr> + </path> + <path + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" + android:strokeWidth="1" + android:strokeColor="#00000000" /> +</vector> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/drawable-xhdpi/ic_add_white_36dp.png b/WeatherInfo/app/src/main/res/drawable-xhdpi/ic_add_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..72cedcad4f1bcedad5e0b69728dd893c52edf322 Binary files /dev/null and b/WeatherInfo/app/src/main/res/drawable-xhdpi/ic_add_white_36dp.png differ diff --git a/WeatherInfo/app/src/main/res/drawable-xxhdpi/ic_add_white_36dp.png b/WeatherInfo/app/src/main/res/drawable-xxhdpi/ic_add_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..16c30e114bfe3a5053dd7e6d55fa7a9eb58443af Binary files /dev/null and b/WeatherInfo/app/src/main/res/drawable-xxhdpi/ic_add_white_36dp.png differ diff --git a/WeatherInfo/app/src/main/res/drawable-xxxhdpi/ic_add_white_36dp.png b/WeatherInfo/app/src/main/res/drawable-xxxhdpi/ic_add_white_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b12e040e08381c707280252703332741c447dcba Binary files /dev/null and b/WeatherInfo/app/src/main/res/drawable-xxxhdpi/ic_add_white_36dp.png differ diff --git a/WeatherInfo/app/src/main/res/drawable/ic_launcher_background.xml b/WeatherInfo/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..07d5da9cbf141911847041df5d7b87f0dd5ef9d4 --- /dev/null +++ b/WeatherInfo/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <path + android:fillColor="#3DDC84" + android:pathData="M0,0h108v108h-108z" /> + <path + android:fillColor="#00000000" + android:pathData="M9,0L9,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,0L19,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M29,0L29,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M39,0L39,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M49,0L49,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M59,0L59,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M69,0L69,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M79,0L79,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M89,0L89,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M99,0L99,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,9L108,9" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,19L108,19" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,29L108,29" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,39L108,39" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,49L108,49" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,59L108,59" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,69L108,69" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,79L108,79" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,89L108,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,99L108,99" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,29L89,29" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,39L89,39" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,49L89,49" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,59L89,59" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,69L89,69" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,79L89,79" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M29,19L29,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M39,19L39,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M49,19L49,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M59,19L59,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M69,19L69,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M79,19L79,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> +</vector> diff --git a/WeatherInfo/app/src/main/res/layout/activity_city.xml b/WeatherInfo/app/src/main/res/layout/activity_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..43e8c1c0b0a82ad668a4a6d68832acec8ee990b1 --- /dev/null +++ b/WeatherInfo/app/src/main/res/layout/activity_city.xml @@ -0,0 +1,29 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".feature.city.CityActivity"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/mainRecyclerView" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|end" + android:layout_margin="24dp" + android:src="@drawable/ic_add_white_36dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/WeatherInfo/app/src/main/res/layout/activity_details.xml b/WeatherInfo/app/src/main/res/layout/activity_details.xml new file mode 100644 index 0000000000000000000000000000000000000000..edd8e3d82104d50696dea7b173b98ed189be8589 --- /dev/null +++ b/WeatherInfo/app/src/main/res/layout/activity_details.xml @@ -0,0 +1,23 @@ +<?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" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin"> + + <com.google.android.material.tabs.TabLayout + android:id="@+id/tabLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" /> + + <androidx.viewpager2.widget.ViewPager2 + android:id="@+id/mainViewPager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + +</LinearLayout> diff --git a/WeatherInfo/app/src/main/res/layout/dialog_new_city.xml b/WeatherInfo/app/src/main/res/layout/dialog_new_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..d0cd1bf8b19c0891da95a3ceb2b1a40a690ce5ce --- /dev/null +++ b/WeatherInfo/app/src/main/res/layout/dialog_new_city.xml @@ -0,0 +1,15 @@ +<?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" + android:padding="24dp"> + + <EditText + android:id="@+id/NewCityDialogEditText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/new_city_hint" + android:inputType="text" /> + +</LinearLayout> diff --git a/WeatherInfo/app/src/main/res/layout/fragment_details_main.xml b/WeatherInfo/app/src/main/res/layout/fragment_details_main.xml new file mode 100644 index 0000000000000000000000000000000000000000..b185647b5f5794f08d8774b7d21f4e6cba594408 --- /dev/null +++ b/WeatherInfo/app/src/main/res/layout/fragment_details_main.xml @@ -0,0 +1,29 @@ +<?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" + android:padding="16dp"> + + <TextView + android:id="@+id/tvMain" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:text="Clear"/> + + <TextView + android:id="@+id/tvDescription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + tools:text="Clear sky"/> + + <ImageView + android:id="@+id/ivIcon" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="16dp"/> + +</LinearLayout> diff --git a/WeatherInfo/app/src/main/res/layout/fragment_details_more.xml b/WeatherInfo/app/src/main/res/layout/fragment_details_more.xml new file mode 100644 index 0000000000000000000000000000000000000000..046877a8c6df392289ec7a379e5c042dd662b624 --- /dev/null +++ b/WeatherInfo/app/src/main/res/layout/fragment_details_more.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<TableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:stretchColumns="0"> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/temperature"/> + <TextView + android:id="@+id/tvTemperature" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="25 °C"/> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/min_temperature"/> + <TextView + android:id="@+id/tvMinTemp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="24 °C"/> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/max_temperature"/> + <TextView + android:id="@+id/tvMaxTemp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="26 °C"/> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pressure"/> + <TextView + android:id="@+id/tvPressure" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="100 Pa"/> + </TableRow> + <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/humidity"/> + <TextView + android:id="@+id/tvHumidity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="50 %"/> + </TableRow> +</TableLayout> diff --git a/WeatherInfo/app/src/main/res/layout/item_city.xml b/WeatherInfo/app/src/main/res/layout/item_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..e4da5a484d8e9fcbcd10ce4f7dd343d0d58800ea --- /dev/null +++ b/WeatherInfo/app/src/main/res/layout/item_city.xml @@ -0,0 +1,27 @@ +<?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="wrap_content" + android:orientation="horizontal" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:weightSum="3"> + + <TextView + android:id="@+id/CityItemNameTextView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="2" + tools:text="Budapest" /> + + <Button + android:id="@+id/CityItemRemoveButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/remove" /> + +</LinearLayout> diff --git a/WeatherInfo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/WeatherInfo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..eca70cfe52eac1ba66ba280a68ca7be8fcf88a16 --- /dev/null +++ b/WeatherInfo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> +</adaptive-icon> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/WeatherInfo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..eca70cfe52eac1ba66ba280a68ca7be8fcf88a16 --- /dev/null +++ b/WeatherInfo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> +</adaptive-icon> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/WeatherInfo/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/WeatherInfo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/WeatherInfo/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/WeatherInfo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..62b611da081676d42f6c3f78a2c91e7bcedddedb Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/WeatherInfo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/WeatherInfo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/WeatherInfo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/WeatherInfo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9287f5083623b375139afb391af71cc533a7dd37 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/WeatherInfo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..aa7d6427e6fa1074b79ccd52ef67ac15c5637e85 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/WeatherInfo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/WeatherInfo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9126ae37cbc3587421d6889eadd1d91fbf1994d4 Binary files /dev/null and b/WeatherInfo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/WeatherInfo/app/src/main/res/values-night/themes.xml b/WeatherInfo/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..de5a68664346aee29a7499bf96113fa754a1b292 --- /dev/null +++ b/WeatherInfo/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ +<resources xmlns:tools="http://schemas.android.com/tools"> + <!-- Base application theme. --> + <style name="Theme.WeatherInfo" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> + <!-- Primary brand color. --> + <item name="colorPrimary">@color/purple_200</item> + <item name="colorPrimaryVariant">@color/purple_700</item> + <item name="colorOnPrimary">@color/black</item> + <!-- Secondary brand color. --> + <item name="colorSecondary">@color/teal_200</item> + <item name="colorSecondaryVariant">@color/teal_200</item> + <item name="colorOnSecondary">@color/black</item> + <!-- Status bar color. --> + <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> + <!-- Customize your theme here. --> + </style> +</resources> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/values/colors.xml b/WeatherInfo/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8c6127d327620c93d2b2d00342a68e97b98a48d --- /dev/null +++ b/WeatherInfo/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="purple_200">#FFBB86FC</color> + <color name="purple_500">#FF6200EE</color> + <color name="purple_700">#FF3700B3</color> + <color name="teal_200">#FF03DAC5</color> + <color name="teal_700">#FF018786</color> + <color name="black">#FF000000</color> + <color name="white">#FFFFFFFF</color> +</resources> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/values/dimens.xml b/WeatherInfo/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000000000000000000000000000000000000..71d15fe14d2d278100a3841a460d69101d7c8738 --- /dev/null +++ b/WeatherInfo/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="activity_vertical_margin">16dp</dimen> + <dimen name="activity_horizontal_margin">16dp</dimen> +</resources> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/values/strings.xml b/WeatherInfo/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..76ad71bf50dc75b0a03589d1fa1636f500cfa564 --- /dev/null +++ b/WeatherInfo/app/src/main/res/values/strings.xml @@ -0,0 +1,23 @@ +<resources> + <string name="app_name">WeatherInfo</string> + + <string name="action_settings">Settings</string> + + <string name="title_activity_city">Cities</string> + <string name="remove">Remove</string> + + <string name="new_city">New city</string> + <string name="new_city_hint">City</string> + <string name="ok">OK</string> + <string name="cancel">Cancel</string> + + <string name="title_activity_details">DetailsActivity</string> + <string name="weather">Weather in %s</string> + <string name="temperature">Temperature</string> + <string name="min_temperature">Min temperature</string> + <string name="max_temperature">Max temperature</string> + <string name="pressure">Pressure</string> + <string name="humidity">Humidity</string> + <string name="main">Main</string> + <string name="details">Details</string> +</resources> diff --git a/WeatherInfo/app/src/main/res/values/themes.xml b/WeatherInfo/app/src/main/res/values/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..cadde5caf0b314e5a34b840a67b4c1efe558f938 --- /dev/null +++ b/WeatherInfo/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ +<resources xmlns:tools="http://schemas.android.com/tools"> + <!-- Base application theme. --> + <style name="Theme.WeatherInfo" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> + <!-- Primary brand color. --> + <item name="colorPrimary">@color/purple_500</item> + <item name="colorPrimaryVariant">@color/purple_700</item> + <item name="colorOnPrimary">@color/white</item> + <!-- Secondary brand color. --> + <item name="colorSecondary">@color/teal_200</item> + <item name="colorSecondaryVariant">@color/teal_700</item> + <item name="colorOnSecondary">@color/black</item> + <!-- Status bar color. --> + <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> + <!-- Customize your theme here. --> + </style> +</resources> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/xml/backup_rules.xml b/WeatherInfo/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..fa0f996d2c2a6bdd11f5371de4268c8389d6c720 --- /dev/null +++ b/WeatherInfo/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Sample backup rules file; uncomment and customize as necessary. + See https://developer.android.com/guide/topics/data/autobackup + for details. + Note: This file is ignored for devices older that API 31 + See https://developer.android.com/about/versions/12/backup-restore +--> +<full-backup-content> + <!-- + <include domain="sharedpref" path="."/> + <exclude domain="sharedpref" path="device.xml"/> +--> +</full-backup-content> \ No newline at end of file diff --git a/WeatherInfo/app/src/main/res/xml/data_extraction_rules.xml b/WeatherInfo/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..9ee9997b0b4726e57c27b2f7b21462b604ff8a88 --- /dev/null +++ b/WeatherInfo/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Sample data extraction rules file; uncomment and customize as necessary. + See https://developer.android.com/about/versions/12/backup-restore#xml-changes + for details. +--> +<data-extraction-rules> + <cloud-backup> + <!-- TODO: Use <include> and <exclude> to control what is backed up. + <include .../> + <exclude .../> + --> + </cloud-backup> + <!-- + <device-transfer> + <include .../> + <exclude .../> + </device-transfer> + --> +</data-extraction-rules> \ No newline at end of file diff --git a/WeatherInfo/app/src/test/java/hu/bme/aut/android/weatherinfo/ExampleUnitTest.kt b/WeatherInfo/app/src/test/java/hu/bme/aut/android/weatherinfo/ExampleUnitTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..a579571472459d36bbcddb6bc19f5aee02f9bab0 --- /dev/null +++ b/WeatherInfo/app/src/test/java/hu/bme/aut/android/weatherinfo/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package hu.bme.aut.android.weatherinfo + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/WeatherInfo/build.gradle b/WeatherInfo/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..c518bc100bb6c62e6fba8c7dbc2dabadda1492f4 --- /dev/null +++ b/WeatherInfo/build.gradle @@ -0,0 +1,6 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.0' apply false + id 'com.android.library' version '7.3.0' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false +} \ No newline at end of file diff --git a/WeatherInfo/gradle.properties b/WeatherInfo/gradle.properties new file mode 100644 index 0000000000000000000000000000000000000000..3c5031eb7d63f785752b1914cc8692a453d1cc63 --- /dev/null +++ b/WeatherInfo/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/WeatherInfo/gradle/wrapper/gradle-wrapper.jar b/WeatherInfo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f Binary files /dev/null and b/WeatherInfo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WeatherInfo/gradle/wrapper/gradle-wrapper.properties b/WeatherInfo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..e950a695625fc6ddad27c5cab86148e1dbd4b8a4 --- /dev/null +++ b/WeatherInfo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Oct 18 08:40:29 CEST 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/WeatherInfo/gradlew b/WeatherInfo/gradlew new file mode 100755 index 0000000000000000000000000000000000000000..4f906e0c811fc9e230eb44819f509cd0627f2600 --- /dev/null +++ b/WeatherInfo/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/WeatherInfo/gradlew.bat b/WeatherInfo/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..ac1b06f93825db68fb0c0b5150917f340eaa5d02 --- /dev/null +++ b/WeatherInfo/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/WeatherInfo/settings.gradle b/WeatherInfo/settings.gradle new file mode 100644 index 0000000000000000000000000000000000000000..5a5a62954a159fae7176c6b7855c4acb97d8a1d7 --- /dev/null +++ b/WeatherInfo/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "WeatherInfo" +include ':app'