diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..aa724b77071afcbd9bb398053e05adaf7ac9405a --- /dev/null +++ b/.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/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000000000000000000000000000000000000..4fda7d1d0ddb0fbebfe4796a7ce9b85dded9d577 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Weather \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..fb7f4a8a465d42b4a0390d464b83b99e8465bba7 --- /dev/null +++ b/.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/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000000000000000000000000000000000000..53c03681fea0c3c546cb651708304161e63eb54a --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="deploymentTargetDropDown"> + <targetSelectedWithDropDown> + <Target> + <type value="QUICK_BOOT_TARGET" /> + <deviceKey> + <Key> + <type value="VIRTUAL_DEVICE_PATH" /> + <value value="$USER_HOME$/.android/avd/Pixel_4_API_30.avd" /> + </Key> + </deviceKey> + </Target> + </targetSelectedWithDropDown> + <timeTargetWasSelectedWithDropDown value="2022-11-15T16:07:57.484504Z" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000000000000000000000000000000000000..ed4fbcb07601d4174a8cf12f5a6709681f421ec4 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ +<?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="gradleHome" value="/usr/local/Cellar/gradle/7.2/libexec" /> + <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/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..bdd92780c2e1701133445c454990531e8a3688b6 --- /dev/null +++ b/.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/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..42afabfd2abebf31384ca7797186a27a4b7dbee8 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..a8ca25cae834f736dee25a54db7b808c859acb89 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,51 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.example.weather' + compileSdk 32 + + defaultConfig { + applicationId "com.example.weather" + minSdk 21 + 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' + } +} + +dependencies { + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.databinding:databinding-common:7.1.2' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + implementation 'androidx.navigation:navigation-ui:2.5.3' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' + implementation 'com.squareup.picasso:picasso:2.71828' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000000000000000000000000000000000000..481bb434814107eb79d7a30b676d344b0df2f8ce --- /dev/null +++ b/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/app/src/androidTest/java/com/example/weather/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/weather/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..4d7dbed02aedb3d23a0b02af970ffdbe650f84f8 --- /dev/null +++ b/app/src/androidTest/java/com/example/weather/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.weather + +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("com.example.weather", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000000000000000000000000000000..d63585bdd036d9eadd14b024981ad0a09c92d220 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + + <application + android:name=".database.App" + 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.Weather" + tools:targetApi="31"> + <activity + android:name=".city.CityActivity" + 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> + <activity + android:name=".weather.WeatherActivity" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + + <data + android:host="weather" + android:pathPattern="/city/.*" + android:scheme="https" /> + </intent-filter> + </activity> + </application> + +</manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/city/City.kt b/app/src/main/java/com/example/weather/city/City.kt new file mode 100644 index 0000000000000000000000000000000000000000..430ab2ebb51ae7f78ec1f0df91b6c12657d056e6 --- /dev/null +++ b/app/src/main/java/com/example/weather/city/City.kt @@ -0,0 +1,5 @@ +package com.example.weather.city + +data class City(var id :Long, var name :String){ + constructor(name: String) : this(-1, name) +} diff --git a/app/src/main/java/com/example/weather/city/CityActivity.kt b/app/src/main/java/com/example/weather/city/CityActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..179539f82b712474964a5d6dea90c9f52575ba44 --- /dev/null +++ b/app/src/main/java/com/example/weather/city/CityActivity.kt @@ -0,0 +1,40 @@ +package com.example.weather.city + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import com.example.weather.R +import com.example.weather.weather.WeatherActivity + +class CityActivity : AppCompatActivity(), CityFragment.CityFragmentListener { + private lateinit var cityFragment: CityFragment + private var currentCity: City? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.city_fragment) + + cityFragment = supportFragmentManager.findFragmentById(R.id.city_fragment) as CityFragment + cityFragment.listener = this + } + + private fun startWeatherActivity(city: City) { + val intent = Intent(this, WeatherActivity::class.java) + intent.putExtra("CITY_NAME", city.name) + startActivity(intent) + } + + override fun onCitySelected(city: City) { + currentCity = city + startWeatherActivity(currentCity!!) + } + + override fun onSelectionCleared() { + TODO("Not yet implemented") + } + + override fun onEmptyCityList() { + TODO("Not yet implemented") + } + +} diff --git a/app/src/main/java/com/example/weather/city/CityAdapter.kt b/app/src/main/java/com/example/weather/city/CityAdapter.kt new file mode 100644 index 0000000000000000000000000000000000000000..ae2c576b02acbaf0d21409cf603b33f6c574a9e7 --- /dev/null +++ b/app/src/main/java/com/example/weather/city/CityAdapter.kt @@ -0,0 +1,43 @@ +package com.example.weather.city + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.cardview.widget.CardView +import androidx.recyclerview.widget.RecyclerView +import com.example.weather.R + +class CityAdapter(private val cities: List<City>, private val cityListener: CityItemListener) : RecyclerView.Adapter<CityAdapter.ViewHolder>(), View.OnClickListener { + interface CityItemListener { + fun onCitySelected(city: City) + fun onCityDeleted(city: City) + } + class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val cityView = itemView.findViewById<CardView>(R.id.cardView)!! + val cityNameView = itemView.findViewById<TextView>(R.id.city_name)!! + val cityDeleteView = itemView.findViewById<ImageView>(R.id.icon)!! + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val viewItem = LayoutInflater.from(parent.context).inflate(R.layout.item_city, parent, false) + return ViewHolder(viewItem) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val city = cities[position] + with(holder) { + cityView.setOnClickListener{ + cityListener.onCitySelected(city) + } + cityDeleteView.setOnClickListener(){ + cityListener.onCityDeleted(city) + } + cityView.tag = city + cityNameView.text = city.name + } + } + override fun getItemCount() = cities.size + override fun onClick(v: View?) {} +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/city/CityFragment.kt b/app/src/main/java/com/example/weather/city/CityFragment.kt new file mode 100644 index 0000000000000000000000000000000000000000..6780027e303797948568eee1710ab63d7e177974 --- /dev/null +++ b/app/src/main/java/com/example/weather/city/CityFragment.kt @@ -0,0 +1,100 @@ +package com.example.weather.city + +import android.os.Bundle +import android.view.* +import android.widget.Toast +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.example.weather.database.App +import com.example.weather.database.Database +import com.example.weather.R + +class CityFragment :Fragment(), CityAdapter.CityItemListener { + interface CityFragmentListener { + fun onCitySelected(city: City) + fun onSelectionCleared() + fun onEmptyCityList() + } + + var listener: CityFragmentListener? = null + + private lateinit var recyclerView: RecyclerView + private lateinit var cityAdapter: CityAdapter + private lateinit var database: Database + private lateinit var cities: MutableList<City> + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + database = App.database + cities = mutableListOf() + setHasOptionsMenu(true) + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + val view = inflater.inflate(R.layout.fragment_city, container, false) + recyclerView = view.findViewById(R.id.cities_recycle_view) + recyclerView.layoutManager = LinearLayoutManager(context) + return view + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + cities = database.getAllCities() + cityAdapter = CityAdapter(cities, this) + recyclerView.adapter = cityAdapter + } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.fragment_city, menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + R.id.action_create_city -> { + showCreateCityDialog() + true + } + else -> super.onOptionsItemSelected(item) + } + } + + private fun showCreateCityDialog() { + val dialog = CreateCityDialogFragment() + dialog.listener = object : CreateCityDialogFragment.CreateCityDialogListener { + override fun onDialogPositiveClick(cityName: String) { + saveCity(cityName) + } + + override fun onDialogNegativeClick() { + Toast.makeText(context, "Отмена", Toast.LENGTH_SHORT).show() + } + } + dialog.show(parentFragmentManager, "CreateCityDialogFragment") + } + + private fun saveCity(cityName: String) { + val city = City(cityName) + if (database.createCity(city)) { + cities.add(city) + cityAdapter.notifyItemInserted(cities.size - 1) + } + else { + Toast.makeText(context, "City already exists", Toast.LENGTH_SHORT).show() + } + } + + override fun onCitySelected(city: City) { + listener?.onCitySelected(city) + } + + override fun onCityDeleted(city: City) { + database.deleteCity(city) + cities.remove(city) + cityAdapter.notifyItemRemoved(cities.size) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/city/CreateCityDialogFragment.kt b/app/src/main/java/com/example/weather/city/CreateCityDialogFragment.kt new file mode 100644 index 0000000000000000000000000000000000000000..ecd421c020caeabc9439a58591c80a4a8169d654 --- /dev/null +++ b/app/src/main/java/com/example/weather/city/CreateCityDialogFragment.kt @@ -0,0 +1,36 @@ +package com.example.weather.city + +import android.app.AlertDialog +import android.app.Dialog +import android.content.DialogInterface +import android.os.Bundle +import android.text.InputType +import android.widget.EditText +import androidx.fragment.app.DialogFragment + +class CreateCityDialogFragment() : DialogFragment() { + interface CreateCityDialogListener { + fun onDialogPositiveClick(cityName: String) + fun onDialogNegativeClick() + } + var listener: CreateCityDialogListener? = null + + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + val builder = AlertDialog.Builder(activity) + val input = EditText(activity) + with(input) { + inputType = InputType.TYPE_CLASS_TEXT + hint = "City name" + } + builder.setTitle("Create city") + .setView(input) + .setPositiveButton("Create", DialogInterface.OnClickListener { _, _ -> + listener?.onDialogPositiveClick(input.text.toString()) + }) + .setNegativeButton("Cancel", DialogInterface.OnClickListener { dialog, _ -> + dialog.cancel() + listener?.onDialogNegativeClick() + }) + return builder.create() + } +} diff --git a/app/src/main/java/com/example/weather/database/App.kt b/app/src/main/java/com/example/weather/database/App.kt new file mode 100644 index 0000000000000000000000000000000000000000..373fedf1e586faaad51d9be629adae25f082b5e8 --- /dev/null +++ b/app/src/main/java/com/example/weather/database/App.kt @@ -0,0 +1,38 @@ +package com.example.weather.database + +import android.app.Application +import com.example.weather.openweathermap.openWeatherService +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +class App : Application() { + companion object { + lateinit var instance: App + + val database: Database by lazy { + Database(instance) + } + + private val httpClient = OkHttpClient.Builder() + .addInterceptor( + okhttp3.logging.HttpLoggingInterceptor().apply { + level = okhttp3.logging.HttpLoggingInterceptor.Level.BODY + } + ) + .build() + + private val retrofit = Retrofit.Builder() + .client(httpClient) + .baseUrl("https://api.openweathermap.org/") + .addConverterFactory(GsonConverterFactory.create()) + .build() + + val weatherService: openWeatherService = retrofit.create(openWeatherService::class.java) + } + + override fun onCreate() { + super.onCreate() + instance = this + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/database/Database.kt b/app/src/main/java/com/example/weather/database/Database.kt new file mode 100644 index 0000000000000000000000000000000000000000..bc3df4f431e8fe641443b88107a828417d129772 --- /dev/null +++ b/app/src/main/java/com/example/weather/database/Database.kt @@ -0,0 +1,82 @@ +package com.example.weather.database + +import android.content.ContentValues +import android.content.Context +import android.database.sqlite.SQLiteDatabase +import android.database.sqlite.SQLiteOpenHelper +import android.util.Log +import com.example.weather.city.City + +private const val DATABASE_NAME = "weather.db" +private const val DATABASE_VERSION = 1 + +private const val CITY_TABLE_NAME = "city" +private const val CITY_COLUMN_ID = "id" +private const val CITY_COLUMN_NAME = "name" + +private const val CREATE_CITY_TABLE = """ + CREATE TABLE $CITY_TABLE_NAME ( + $CITY_COLUMN_ID INTEGER PRIMARY KEY AUTOINCREMENT, + $CITY_COLUMN_NAME TEXT NOT NULL + ) +""" + +private const val DROP_CITY_TABLE = "DROP TABLE IF EXISTS $CITY_TABLE_NAME" + +private const val SELECT_ALL_CITIES = "SELECT * FROM $CITY_TABLE_NAME" + +private const val SELECT_CITY_BY_ID = "SELECT * FROM $CITY_TABLE_NAME WHERE $CITY_COLUMN_ID = ?" + +private const val SELECT_CITY_BY_NAME = "SELECT * FROM $CITY_TABLE_NAME WHERE $CITY_COLUMN_NAME = ?" + +private const val INSERT_CITY = "INSERT INTO $CITY_TABLE_NAME ($CITY_COLUMN_NAME) VALUES (?)" + +private const val UPDATE_CITY = "UPDATE $CITY_TABLE_NAME SET $CITY_COLUMN_NAME = ? WHERE $CITY_COLUMN_ID = ?" + +private const val DELETE_CITY = "DELETE FROM $CITY_TABLE_NAME WHERE $CITY_COLUMN_ID = ?" + +private const val DELETE_ALL_CITIES = "DELETE FROM $CITY_TABLE_NAME" + +private const val COUNT_CITIES = "SELECT COUNT(*) FROM $CITY_TABLE_NAME" + + class Database(context: Context) : SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) { + + val TAG = Database::class.java.simpleName + + override fun onCreate(p0: SQLiteDatabase?) { + p0?.execSQL(CREATE_CITY_TABLE) + } + + override fun onUpgrade(p0: SQLiteDatabase?, p1: Int, p2: Int) { + TODO("Not yet implemented") + } + + fun createCity(city: City) : Boolean { + val values = ContentValues() + values.put(CITY_COLUMN_NAME, city.name) + Log.d(TAG, "createCity: $city") + + val id = this.writableDatabase.insert(CITY_TABLE_NAME, null, values) + city.id = id + return id>0 + } + + fun getAllCities(): MutableList<City> { + val cities = mutableListOf<City>() + readableDatabase.rawQuery(SELECT_ALL_CITIES, null).use { + while(it.moveToNext()) { + val id = it.getLong(it.getColumnIndex(CITY_COLUMN_ID)) + val name = it.getString(it.getColumnIndex(CITY_COLUMN_NAME)) + cities.add(City(id, name)) + } + } + return cities + } + + fun deleteCity(city: City) : Boolean { + val selectionArgs = arrayOf(city.id.toString()) + val deletedRows = this.writableDatabase.delete(CITY_TABLE_NAME, "$CITY_COLUMN_ID = ?", selectionArgs) + return deletedRows > 0 + } + + } diff --git a/app/src/main/java/com/example/weather/openweathermap/Mappers.kt b/app/src/main/java/com/example/weather/openweathermap/Mappers.kt new file mode 100644 index 0000000000000000000000000000000000000000..49f14d3d24d533d6989f19523eb9ce6f0eace9c0 --- /dev/null +++ b/app/src/main/java/com/example/weather/openweathermap/Mappers.kt @@ -0,0 +1,14 @@ +package com.example.weather.openweathermap + +import com.example.weather.weather.Weather + +fun mapOpenWeatherToWeather(weatherWrapper: WeatherWrapper): Weather { + val weatherFirst = weatherWrapper.weather.first() + return Weather( + description = weatherFirst.description, + iconUrl = "http://openweathermap.org/img/w/${weatherFirst.icon}.png", + temperature = weatherWrapper.main.temperature, + humidity = weatherWrapper.main.humidity, + pressure = weatherWrapper.main.pressure + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/openweathermap/OpenWeatherData.kt b/app/src/main/java/com/example/weather/openweathermap/OpenWeatherData.kt new file mode 100644 index 0000000000000000000000000000000000000000..57c3ce235c8ca0843ee7bf83d796ec5f142bc0de --- /dev/null +++ b/app/src/main/java/com/example/weather/openweathermap/OpenWeatherData.kt @@ -0,0 +1,39 @@ +package com.example.weather.openweathermap + +import android.graphics.drawable.Icon +import com.google.gson.annotations.SerializedName + + +data class WeatherWrapper( + val weather: Array<WeatherData>, + val main: MainData, +) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as WeatherWrapper + + if (!weather.contentEquals(other.weather)) return false + if (main != other.main) return false + + return true + } + + override fun hashCode(): Int { + var result = weather.contentHashCode() + result = 31 * result + main.hashCode() + return result + } +} + +data class WeatherData( + val description: String, + val icon: String, +) + +data class MainData( + @SerializedName("temp") val temperature: Float, + val humidity: Int, + val pressure: Int +) \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/openweathermap/openWeatherService.kt b/app/src/main/java/com/example/weather/openweathermap/openWeatherService.kt new file mode 100644 index 0000000000000000000000000000000000000000..bac43da68dba62572cecdb00aafcf897c8103c4a --- /dev/null +++ b/app/src/main/java/com/example/weather/openweathermap/openWeatherService.kt @@ -0,0 +1,14 @@ +package com.example.weather.openweathermap + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query + +private const val API_KEY = "6990b4d4c41a258e32e19ba9f3a5c48f" + +interface openWeatherService { + @GET("data/2.5/weather?units=metric&lang=fr") + fun getWeather( + @Query("q") cityName: String, + @Query("appid") apiKey : String = API_KEY) : Call<WeatherWrapper> +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weather/weather/Weather.kt b/app/src/main/java/com/example/weather/weather/Weather.kt new file mode 100644 index 0000000000000000000000000000000000000000..29935965a18df31489c87ad42cf842150ea7a6ee --- /dev/null +++ b/app/src/main/java/com/example/weather/weather/Weather.kt @@ -0,0 +1,8 @@ +package com.example.weather.weather + +data class Weather( + val description: String, + val temperature: Float, + val humidity: Int, + val pressure: Int, + val iconUrl: String) diff --git a/app/src/main/java/com/example/weather/weather/WeatherActivity.kt b/app/src/main/java/com/example/weather/weather/WeatherActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..a001bc52d74af0c679e448d253b11417465b5559 --- /dev/null +++ b/app/src/main/java/com/example/weather/weather/WeatherActivity.kt @@ -0,0 +1,13 @@ +package com.example.weather.weather + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class WeatherActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + supportFragmentManager.beginTransaction() + .replace(android.R.id.content, WeatherFragment.newInstance()) + .commit() + } +} diff --git a/app/src/main/java/com/example/weather/weather/WeatherFragment.kt b/app/src/main/java/com/example/weather/weather/WeatherFragment.kt new file mode 100644 index 0000000000000000000000000000000000000000..40ada90a6e8dd73981be2fc336cbf796aaa87cb7 --- /dev/null +++ b/app/src/main/java/com/example/weather/weather/WeatherFragment.kt @@ -0,0 +1,85 @@ +package com.example.weather.weather + +import android.graphics.BitmapFactory +import android.net.Uri +import android.os.Bundle +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 android.widget.Toast +import androidx.core.net.toUri +import androidx.fragment.app.Fragment +import com.example.weather.R +import com.example.weather.database.App +import com.example.weather.openweathermap.WeatherWrapper +import com.example.weather.openweathermap.mapOpenWeatherToWeather +import com.squareup.picasso.Picasso +import retrofit2.Call + +class WeatherFragment() : Fragment() { + companion object { + fun newInstance() = WeatherFragment() + } + + private lateinit var city: TextView + private lateinit var temperature: TextView + private lateinit var weatherDescription: TextView + private lateinit var humidity: TextView + private lateinit var pressure: TextView + private lateinit var weatherIcon: ImageView + + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + val view = inflater.inflate(R.layout.fragment_weather, container, false) + city = view.findViewById(R.id.city) + temperature = view.findViewById(R.id.temperature) + weatherDescription = view.findViewById(R.id.weather_description) + humidity = view.findViewById(R.id.humidity) + pressure = view.findViewById(R.id.pressure) + weatherIcon = view.findViewById(R.id.weather_icon) + return view + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + if (activity?.intent!!.hasExtra("CITY_NAME")) { + getWeatherForCity(activity?.intent!!.getStringExtra("CITY_NAME")!!) + } + } + + private fun updateUi(weather: Weather) { + weatherDescription.text = weather.description + temperature.text = getString(R.string.weather_temperature_value, weather.temperature.toInt()) + humidity.text = getString(R.string.weather_humidity_value, weather.humidity) + pressure.text = getString(R.string.weather_pressure_value, weather.pressure) + } + + private fun getWeatherForCity(cityName: String) { + val call = App.weatherService.getWeather("$cityName,fr") + call.enqueue(object : retrofit2.Callback<WeatherWrapper> { + override fun onResponse( + call: Call<WeatherWrapper>, + response: retrofit2.Response<WeatherWrapper> + ){ + Log.d("WeatherFragment", "onResponse: ${response.body()}") + response.body()?.let { + val weather = mapOpenWeatherToWeather(it) + updateUi(weather) + Log.d("WeatherFragment", "onResponse: $weather") + } + } + + override fun onFailure(call: Call<WeatherWrapper>, t: Throwable) { + Log.d("WeatherFragment", "onFailure: ${t.message}") + Toast.makeText(context, "Error: ${t.message}", Toast.LENGTH_LONG).show() + } + }) + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..2b068d11462a4b96669193de13a711a3a36220a0 --- /dev/null +++ b/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/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml new file mode 100644 index 0000000000000000000000000000000000000000..88d8dacf7f5dba8f736a082759abdaca0527721b --- /dev/null +++ b/app/src/main/res/drawable/circle.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:top="0dp" android:left="0dp" android:bottom="0dp" android:right="0dp"> + <shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" > + <size + android:width="30dp" + android:height="30dp" /> + </shape> + </item> + + <item android:top="10dp" android:left="17dp" android:bottom="10dp" android:right="17dp"> + <shape> + <stroke android:width="0dp" android:color="@color/black" /> + <padding android:left="0dp" + android:top="0dp" + android:right="0dp" + android:bottom="0dp" /> + <corners android:radius="0dp" /> + <solid android:color="@color/black" /> + </shape> + </item> + + <item android:top="17dp" android:left="10dp" android:bottom="17dp" android:right="10dp"> + <shape> + <stroke android:width="0dp" android:color="#ff207d94" /> + <padding android:left="0dp" + android:top="0dp" + android:right="0dp" + android:bottom="0dp" /> + <corners android:radius="0dp" /> + <solid android:color="@color/black" /> + </shape> + </item> +</layer-list> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml b/app/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..005ca07e31a8d4e2011b75f7118b43f33f33d914 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#FFFFFF" + 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="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_baseline_delete_24.xml b/app/src/main/res/drawable/ic_baseline_delete_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..c7d61b493c1921913751a1740d0f2d7b9db1d02f --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_delete_24.xml @@ -0,0 +1,5 @@ +<vector android:height="48dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..07d5da9cbf141911847041df5d7b87f0dd5ef9d4 --- /dev/null +++ b/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/app/src/main/res/layout/activity_city.xml b/app/src/main/res/layout/activity_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..7f5373a52b25840714f8ab9073b00a89e3caa109 --- /dev/null +++ b/app/src/main/res/layout/activity_city.xml @@ -0,0 +1,18 @@ +<?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=".city.CityActivity"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Hello World!" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/city_fragment.xml b/app/src/main/res/layout/city_fragment.xml new file mode 100644 index 0000000000000000000000000000000000000000..fd4e36e44ebb9797c1351833181d4b16e8e1b604 --- /dev/null +++ b/app/src/main/res/layout/city_fragment.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="com.example.weather.city.CityActivity"> + + <fragment + android:id="@+id/city_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:name="com.example.weather.city.CityFragment" + /> +</LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_city.xml b/app/src/main/res/layout/fragment_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..8bca9bb6f99566f2f9f28677a4e5e2426f3d19b3 --- /dev/null +++ b/app/src/main/res/layout/fragment_city.xml @@ -0,0 +1,13 @@ +<?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"> + + <androidx.recyclerview.widget.RecyclerView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/cities_recycle_view" + tools:listitem="@layout/item_city"/> + +</RelativeLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_weather.xml b/app/src/main/res/layout/fragment_weather.xml new file mode 100644 index 0000000000000000000000000000000000000000..539c9db1f860b1c222d2bccfd2be82c855645dea --- /dev/null +++ b/app/src/main/res/layout/fragment_weather.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + + <TextView + android:id="@+id/city" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:layout_marginTop="10dp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:textSize="30sp" + android:textStyle="bold" + tools:text="Toulouse"/> + + <ImageView + android:id="@+id/weather_icon" + android:layout_width="100dp" + android:layout_height="0dp" + android:layout_marginTop="30dp" + app:layout_constraintDimensionRatio="1:1" + app:layout_constraintLeft_toLeftOf="@+id/city" + app:layout_constraintTop_toBottomOf="@+id/city" + tools:src="@mipmap/ic_launcher" + tools:ignore="contentDescription"/> + + <TextView + android:id="@+id/weather_description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="30dp" + android:textSize="30sp" + app:layout_constraintStart_toEndOf="@+id/weather_icon" + app:layout_constraintTop_toTopOf="@+id/weather_icon" + app:layout_constraintBottom_toBottomOf="@id/weather_icon" + tools:layout_editor_absoluteY="120dp" + android:textColor="@color/black" + tools:text="Sunny" /> + + <FrameLayout + android:id="@+id/back_info" + android:layout_width="match_parent" + android:layout_height="250dp" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/weather_icon"/> + + <TextView + android:id="@+id/temperature_label" + android:layout_width="150dp" + android:layout_height="wrap_content" + app:layout_constraintLeft_toLeftOf="@id/weather_icon" + app:layout_constraintTop_toTopOf="@id/back_info" + android:textSize="20sp" + app:layout_constraintVertical_chainStyle="spread" + tools:text="Temperature"/> + + <TextView + android:id="@+id/temperature" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintLeft_toRightOf="@id/temperature_label" + app:layout_constraintTop_toTopOf="@id/temperature_label" + app:layout_constraintBottom_toBottomOf="@id/temperature_label" + android:textSize="30sp" + android:textStyle="bold" + tools:text="20°C"/> + + <TextView + android:id="@+id/humidity_label" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintLeft_toLeftOf="@id/temperature_label" + app:layout_constraintTop_toBottomOf="@id/temperature_label" + app:layout_constraintRight_toRightOf="@id/temperature_label" + app:layout_constraintBottom_toTopOf="@id/pressure_label" + android:textSize="20sp" + tools:text="Humidity"/> + + <TextView + android:id="@+id/humidity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintLeft_toLeftOf="@id/temperature" + app:layout_constraintTop_toTopOf="@id/humidity_label" + app:layout_constraintBottom_toBottomOf="@id/humidity_label" + android:textSize="30sp" + android:textStyle="bold" + tools:text="80%"/> + + <TextView + android:id="@+id/pressure_label" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintLeft_toLeftOf="@id/temperature_label" + app:layout_constraintTop_toBottomOf="@id/humidity_label" + app:layout_constraintRight_toRightOf="@id/temperature_label" + android:textSize="20sp" + tools:text="Pressure"/> + + <TextView + android:id="@+id/pressure" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_constraintLeft_toLeftOf="@id/temperature" + app:layout_constraintTop_toTopOf="@id/pressure_label" + app:layout_constraintBottom_toBottomOf="@id/pressure_label" + android:textSize="30sp" + android:textStyle="bold" + tools:text="1000hPa"/> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/item_city.xml b/app/src/main/res/layout/item_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..6d7a85236c2699fbddb420c20f16a3c64a5a1882 --- /dev/null +++ b/app/src/main/res/layout/item_city.xml @@ -0,0 +1,36 @@ +<?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="wrap_content"> + + <androidx.cardview.widget.CardView + android:id="@+id/cardView" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentEnd="true" + android:src="@drawable/ic_baseline_delete_24" + tools:ignore="contentDescription" /> + + <TextView + android:id="@+id/city_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:text="@string/city_name" /> + + </RelativeLayout> + + </androidx.cardview.widget.CardView> + +</RelativeLayout> \ No newline at end of file diff --git a/app/src/main/res/menu/fragment_city.xml b/app/src/main/res/menu/fragment_city.xml new file mode 100644 index 0000000000000000000000000000000000000000..58165d3ec7a9a5d33727ef5dc13107c94aa2658e --- /dev/null +++ b/app/src/main/res/menu/fragment_city.xml @@ -0,0 +1,11 @@ +<?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/action_create_city" + android:orderInCategory="100" + android:icon="@drawable/ic_baseline_add_circle_outline_24" + android:title="@string/create_city" + app:showAsAction="always" /> + +</menu> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..eca70cfe52eac1ba66ba280a68ca7be8fcf88a16 --- /dev/null +++ b/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/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..eca70cfe52eac1ba66ba280a68ca7be8fcf88a16 --- /dev/null +++ b/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/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..62b611da081676d42f6c3f78a2c91e7bcedddedb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9287f5083623b375139afb391af71cc533a7dd37 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..aa7d6427e6fa1074b79ccd52ef67ac15c5637e85 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9126ae37cbc3587421d6889eadd1d91fbf1994d4 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..b771cce6141092b65cfd2926b2abc662d15d32ad --- /dev/null +++ b/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.Weather" 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/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8c6127d327620c93d2b2d00342a68e97b98a48d --- /dev/null +++ b/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/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..d78adb735b2ba134aa636a8ea19e7c0a856b5d8c --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,12 @@ +<resources> + <string name="app_name">Weather</string> + <string name="create_city">Create City</string> + <string name="city_name">City Name</string> + <string name="weather_temperature_label">Temperature :</string> + <string name="weather_humidity_label">Humidity :</string> + <string name="weather_pressure_label">Pressure :</string> + <string name="weather_temperature_value">%1$d °C</string>¨ + <string name="weather_humidity_value">%1$d %%</string> + <string name="weather_pressure_value">%1$d hPa</string> + <string name="weather_error">Error</string> +</resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..a3e4819de044bdae0fb06a599b128375aa8ef866 --- /dev/null +++ b/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.Weather" 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/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..fa0f996d2c2a6bdd11f5371de4268c8389d6c720 --- /dev/null +++ b/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/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..9ee9997b0b4726e57c27b2f7b21462b604ff8a88 --- /dev/null +++ b/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/app/src/test/java/com/example/weather/ExampleUnitTest.kt b/app/src/test/java/com/example/weather/ExampleUnitTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..5fdd90db6a8b658cb9bc787ed5d964464ba0bdb7 --- /dev/null +++ b/app/src/test/java/com/example/weather/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.weather + +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/build.gradle b/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..25369742325e1ecdb662a2a280e3db939fddce16 --- /dev/null +++ b/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.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000000000000000000000000000000000..3c5031eb7d63f785752b1914cc8692a453d1cc63 --- /dev/null +++ b/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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..4011298d5b1f8c628d8d1540be07d7b0166b1d5b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Nov 13 12:12:16 CET 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/gradlew b/gradlew new file mode 100755 index 0000000000000000000000000000000000000000..4f906e0c811fc9e230eb44819f509cd0627f2600 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..ac1b06f93825db68fb0c0b5150917f340eaa5d02 --- /dev/null +++ b/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/settings.gradle b/settings.gradle new file mode 100644 index 0000000000000000000000000000000000000000..d5d7c2d5bf467cddd8ab1c3e154ea7f792a1cfc7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "Weather" +include ':app'