diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..aa724b77 --- /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 00000000..26d33521 --- /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 00000000..34bc596d --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Starwars api \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..fb7f4a8a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..5cd135a0 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..0380d8d3 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..6199cc2a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..797acea5 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /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 00000000..3dd5cbc3 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,64 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' + + // to use widgets directly + id 'kotlin-android-extensions' +} + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.3" + + defaultConfig { + applicationId "com.example.starwarsapi" + minSdkVersion 16 + targetSdkVersion 30 + 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 "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.5.0' + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + + testImplementation 'junit:junit:4.+' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + + //to MVVM + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + + //Retrofit to consume api + implementation 'com.squareup.retrofit2:retrofit:2.4.0' + implementation 'com.squareup.retrofit2:converter-gson:2.4.0' + + //glide to consime url images + implementation 'com.github.bumptech.glide:glide:4.11.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + + //mockito to test + testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" + testImplementation 'android.arch.core:core-testing:1.1.1' +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /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/starwarsapi/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/starwarsapi/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..1bfb7b52 --- /dev/null +++ b/app/src/androidTest/java/com/example/starwarsapi/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.starwarsapi + +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.starwarsapi", 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 00000000..0c0d8689 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/model/api/StarWarsApiResponse.kt b/app/src/main/java/com/example/starwarsapi/model/api/StarWarsApiResponse.kt new file mode 100644 index 00000000..caec284d --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/model/api/StarWarsApiResponse.kt @@ -0,0 +1,19 @@ +package com.example.starwarsapi.model.api + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class StarWarsApiResponse ( + @Expose @SerializedName ("count") val count:Int, + @Expose @SerializedName ("next") val next: String, + @Expose @SerializedName ("previous") val previous: String, + @Expose @SerializedName ("results") val results: List + ) + +data class StarWarsResult( + @Expose @SerializedName( "name") val name: String, + @Expose @SerializedName( "gender") val gender: String, + @Expose @SerializedName( "height") val heigth: String, + @Expose @SerializedName( "mass") val mass: String, + @Expose @SerializedName( "url") val url: String +) \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/model/api/Starwars.kt b/app/src/main/java/com/example/starwarsapi/model/api/Starwars.kt new file mode 100644 index 00000000..94bccd38 --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/model/api/Starwars.kt @@ -0,0 +1,16 @@ +package com.example.starwarsapi.model.api + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +data class Starwars ( + @Expose @SerializedName("id") val id: Int, + @Expose @SerializedName("name") val name: String, + @Expose @SerializedName("gender") val gender: String, + @Expose @SerializedName("mass") val mass: String, + @Expose @SerializedName("hair_color") val hair_color: String, + @Expose @SerializedName("skin_color") val skin_color: String, + @Expose @SerializedName("eye_color") val eye_color: String, + @Expose @SerializedName("birth_year") val birth_year: String, + @Expose @SerializedName("height") val height: String + ) diff --git a/app/src/main/java/com/example/starwarsapi/service/StarWarsApiService.kt b/app/src/main/java/com/example/starwarsapi/service/StarWarsApiService.kt new file mode 100644 index 00000000..bd93361f --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/service/StarWarsApiService.kt @@ -0,0 +1,15 @@ +package com.example.starwarsapi.service + +import com.example.starwarsapi.model.api.Starwars +import com.example.starwarsapi.model.api.StarWarsApiResponse +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface StarWarsApiService { + @GET("people/{id}") + fun getStarWarsInfo(@Path("id") id: Int): Call + @GET("people") + fun getStarWarsList(@Query("limit") limit: Int, @Query("offset") offset: Int): Call +} \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/ui/splashActivity/SplashActivity.kt b/app/src/main/java/com/example/starwarsapi/ui/splashActivity/SplashActivity.kt new file mode 100644 index 00000000..2fd7d28b --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/ui/splashActivity/SplashActivity.kt @@ -0,0 +1,27 @@ +package com.example.starwarsapi.ui.splashActivity + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.os.Handler +import android.view.WindowManager +import com.example.starwarsapi.R +import com.example.starwarsapi.ui.starWarsList.StarWarsListActivity + +class SplashActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_splash) + + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN) + + Handler().postDelayed({ + val intent = Intent(this, StarWarsListActivity::class.java) + startActivity(intent) + }, 3000) + + } + + + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/ui/starWarsInfo/StarWarsInfoActivity.kt b/app/src/main/java/com/example/starwarsapi/ui/starWarsInfo/StarWarsInfoActivity.kt new file mode 100644 index 00000000..cfc7785d --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/ui/starWarsInfo/StarWarsInfoActivity.kt @@ -0,0 +1,74 @@ +package com.example.starwarsapi.ui.starWarsInfo + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.view.Menu +import android.view.MenuItem +import android.view.WindowManager +import androidx.lifecycle.ViewModelProvider +import com.example.starwarsapi.R +import kotlinx.android.synthetic.main.activity_starwars_info.* + +class StarWarsInfoActivity : AppCompatActivity() { + + lateinit var viewModel: StarWarsInfoViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_starwars_info) + + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN) + + viewModel = ViewModelProvider(this).get(StarWarsInfoViewModel::class.java) + + initUI() + + } + + private fun initUI() { + val id = intent.extras?.get("id") as Int + + viewModel.getStarWarsInfo(id) + + viewModel.starWarsInfo.observe(this,{ starwars -> + text_name_person_detail.text = starwars.name + text_height_person_detail.text = "Altura: ${starwars.height}cm" + text_mass_person_detail.text = "Peso: ${starwars.mass}kg" + text_gender_person_detail.text = "Genero: ${starwars.gender}" + text_hair_color_person_detail.text = "Cor do Cabelo: ${starwars.hair_color}" + text_eye_color_person_detail.text = "Cor dos Olhos: ${starwars.eye_color}" + text_skin_color_person_detail.text = "Cor da Pele: ${starwars.skin_color}" + text_birth_year_person_detail.text = "Ano de Nascimento: ${starwars.birth_year}" + + }) + } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + menuInflater.inflate(R.menu.menu,menu) + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId){ + R.id.share ->{ + // compartilha itens da activity de detalhe + val sendIntent: Intent = Intent().apply { + action = Intent.ACTION_SEND + putExtra(Intent.EXTRA_TEXT, text_name_person_detail.text) + type = "text/plain" + + } + + val shareIntent = Intent.createChooser(sendIntent, null) + startActivity(shareIntent) + + return true + } + + + else -> true + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/ui/starWarsInfo/StarWarsInfoViewModel.kt b/app/src/main/java/com/example/starwarsapi/ui/starWarsInfo/StarWarsInfoViewModel.kt new file mode 100644 index 00000000..7d37d73e --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/ui/starWarsInfo/StarWarsInfoViewModel.kt @@ -0,0 +1,40 @@ +package com.example.starwarsapi.ui.starWarsInfo + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import com.example.starwarsapi.model.api.Starwars +import com.example.starwarsapi.service.StarWarsApiService +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +class StarWarsInfoViewModel : ViewModel() { + private val retrofit : Retrofit = Retrofit.Builder() + .baseUrl("https://swapi.dev/api/") + .addConverterFactory(GsonConverterFactory.create()) + .build() + + private val service: StarWarsApiService = retrofit.create(StarWarsApiService::class.java) + + val starWarsInfo = MutableLiveData() + + fun getStarWarsInfo(id: Int){ + val call = service.getStarWarsInfo(id) + + call.enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + response.body()?.let { starwars -> + starWarsInfo.postValue(starwars) + } + } + + override fun onFailure(call: Call, t: Throwable) { + call.cancel() + + } + + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListActivity.kt b/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListActivity.kt new file mode 100644 index 00000000..003efaf8 --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListActivity.kt @@ -0,0 +1,46 @@ +package com.example.starwarsapi.ui.starWarsList + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.view.WindowManager +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.LinearLayoutManager +import com.example.starwarsapi.ui.starWarsInfo.StarWarsInfoActivity +import com.example.starwarsapi.R +import kotlinx.android.synthetic.main.activity_starwars_list.* + +class StarWarsListActivity : AppCompatActivity() { + + private lateinit var viewModel: StarWarsListViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_starwars_list) + + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN) + + viewModel = ViewModelProvider (this).get(StarWarsListViewModel::class.java) + + initUI() + } + + private fun initUI(){ + recyclerview_starwars_list.layoutManager= LinearLayoutManager(this) + recyclerview_starwars_list.adapter = StarWarsListAdapter{ + val intent = Intent(this, StarWarsInfoActivity::class.java) + intent.putExtra("id", it) //passa o id da posição que foi clicado + startActivity(intent) + } + + viewModel.getStarWarsList() + + viewModel.starWarsList.observe( this, Observer { list -> + + (recyclerview_starwars_list.adapter as StarWarsListAdapter).setData(list) + + } ) + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListAdapter.kt b/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListAdapter.kt new file mode 100644 index 00000000..9faf00fb --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListAdapter.kt @@ -0,0 +1,38 @@ +package com.example.starwarsapi.ui.starWarsList + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.example.starwarsapi.model.api.StarWarsResult +import com.example.starwarsapi.R +import kotlinx.android.synthetic.main.card_starwars_search.view.* + +class StarWarsListAdapter(val starWarsClick: (Int) -> Unit ):RecyclerView.Adapter() { + var starWarsList : List = emptyList() + + fun setData(list : List){ + starWarsList = list + notifyDataSetChanged() + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchViewHolder { + return SearchViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.card_starwars_search,parent,false)) + } + + override fun getItemCount(): Int { + return starWarsList.size + } + + override fun onBindViewHolder(holder: SearchViewHolder, position: Int) { + val starWars = starWarsList [position] + holder.itemView.text_name_person.text=starWars.name + holder.itemView.text_gender_person.text="Genero: ${starWars.gender}" + holder.itemView.text_mass_person.text="Peso: ${starWars.mass}kg" + holder.itemView.text_height_person.text="Altura: ${starWars.heigth}cm" + + holder.itemView.setOnClickListener{starWarsClick(position+1)} + } + + class SearchViewHolder(itemView : View) : RecyclerView.ViewHolder(itemView) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListViewModel.kt b/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListViewModel.kt new file mode 100644 index 00000000..a0f3463c --- /dev/null +++ b/app/src/main/java/com/example/starwarsapi/ui/starWarsList/StarWarsListViewModel.kt @@ -0,0 +1,39 @@ +package com.example.starwarsapi.ui.starWarsList + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import com.example.starwarsapi.model.api.StarWarsApiResponse +import com.example.starwarsapi.model.api.StarWarsResult +import com.example.starwarsapi.service.StarWarsApiService +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +class StarWarsListViewModel(): ViewModel() { + private val retrofit = Retrofit.Builder() + .baseUrl("https://swapi.dev/api/") + .addConverterFactory(GsonConverterFactory.create()) + .build() + private val service: StarWarsApiService = retrofit.create(StarWarsApiService::class.java) + + val starWarsList = MutableLiveData>() + + fun getStarWarsList(){ + val call = service.getStarWarsList(100,0) + + call.enqueue(object : Callback{ + override fun onResponse(call: Call, response: Response) { + response.body()?.results?.let{list -> + starWarsList.postValue(list) + } + } + + override fun onFailure(call: Call, t: Throwable) { + call.cancel() + } + + }) + } +} \ 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 00000000..2b068d11 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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 00000000..07d5da9c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_share_24.xml b/app/src/main/res/drawable/ic_share_24.xml new file mode 100644 index 00000000..9300daf6 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png new file mode 100644 index 00000000..28434600 Binary files /dev/null and b/app/src/main/res/drawable/logo.png differ diff --git a/app/src/main/res/drawable/space.png b/app/src/main/res/drawable/space.png new file mode 100644 index 00000000..374977f0 Binary files /dev/null and b/app/src/main/res/drawable/space.png differ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 00000000..c0084b1b --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,42 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_starwars_info.xml b/app/src/main/res/layout/activity_starwars_info.xml new file mode 100644 index 00000000..5a4b9df4 --- /dev/null +++ b/app/src/main/res/layout/activity_starwars_info.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_starwars_list.xml b/app/src/main/res/layout/activity_starwars_list.xml new file mode 100644 index 00000000..da136dd8 --- /dev/null +++ b/app/src/main/res/layout/activity_starwars_list.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/card_starwars_search.xml b/app/src/main/res/layout/card_starwars_search.xml new file mode 100644 index 00000000..83073743 --- /dev/null +++ b/app/src/main/res/layout/card_starwars_search.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml new file mode 100644 index 00000000..cf9fb56b --- /dev/null +++ b/app/src/main/res/menu/menu.xml @@ -0,0 +1,11 @@ + + + + + + \ 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 00000000..eca70cfe --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ 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 00000000..eca70cfe --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..a571e600 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..61da551c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..c41dd285 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..db5080a7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..6dba46da Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..da31a871 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..15ac6817 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..b216f2d3 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..f25a4197 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..e96783cc Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png 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 00000000..785a9480 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ 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 00000000..5a5bba21 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,14 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + #F4C846 + #FFC107 + #765902 + #AEAEAE + \ 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 00000000..4c753b17 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Starwars api + \ 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 00000000..71db03b9 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/test/java/com/example/starwarsapi/ExampleUnitTest.kt b/app/src/test/java/com/example/starwarsapi/ExampleUnitTest.kt new file mode 100644 index 00000000..8edaa2e0 --- /dev/null +++ b/app/src/test/java/com/example/starwarsapi/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.starwarsapi + +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 00000000..f2a4d125 --- /dev/null +++ b/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.5.20" + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:4.2.1" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + mavenCentral() + jcenter() // Warning: this repository is going to shut down soon + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..25217527 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# 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 \ 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 00000000..f6b961fd 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 00000000..a61d5978 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Jul 14 04:22:44 BRT 2021 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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="" + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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 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= + +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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 00000000..ccf5a507 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = "Starwars api" +include ':app'