diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /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/$CACHE_FILE$ b/.idea/$CACHE_FILE$ new file mode 100644 index 0000000..f9784d3 --- /dev/null +++ b/.idea/$CACHE_FILE$ @@ -0,0 +1,17 @@ + + + + + + + + + + + Android + + + + + + \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /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 0000000..23a89bb --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d5d35ec --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /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 0000000..9d50431 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,68 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-kapt' +} + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "com.project.retoandroid" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + + buildFeatures.dataBinding true + + 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 { + + def retrofit_version = '2.9.0' + def ok_http3_version = '4.5.0' + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'com.android.support.constraint:constraint-layout:2.0.4' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + + implementation "com.squareup.okhttp3:logging-interceptor:$ok_http3_version" + implementation "com.squareup.okhttp3:okhttp:$ok_http3_version" + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version" + + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0' + + implementation 'io.coil-kt:coil:0.11.0' + + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1' + + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /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/project/retoandroid/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/project/retoandroid/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..a037e83 --- /dev/null +++ b/app/src/androidTest/java/com/project/retoandroid/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.project.retoandroid + +import android.support.test.InstrumentationRegistry +import android.support.test.runner.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.project.retoandroid", 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 0000000..68bda7a --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/app/Injection.kt b/app/src/main/java/com/project/retoandroid/app/Injection.kt new file mode 100644 index 0000000..9ef8914 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/app/Injection.kt @@ -0,0 +1,11 @@ +package com.project.retoandroid.app + +import com.project.retoandroid.data.repository.UserRepository + +object Injection { + + fun provideUserRepository(): UserRepository { + return UserRepository.getInstance() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/app/user/MainActivity.kt b/app/src/main/java/com/project/retoandroid/app/user/MainActivity.kt new file mode 100644 index 0000000..e83b6ef --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/app/user/MainActivity.kt @@ -0,0 +1,51 @@ +package com.project.retoandroid.app.user + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.databinding.DataBindingUtil +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProvider +import com.project.retoandroid.R +import com.project.retoandroid.app.userDetail.UserDetailActivity +import com.project.retoandroid.databinding.ActivityMainBinding + +class MainActivity : AppCompatActivity() { + + private lateinit var binding: ActivityMainBinding + private lateinit var viewModel: UserViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + val factory = UserViewModel.Factory(application) + viewModel = ViewModelProvider(viewModelStore, factory).get(UserViewModel::class.java) + binding = DataBindingUtil.setContentView(this, R.layout.activity_main) + + binding.viewModel = viewModel + binding.lifecycleOwner = this + + binding.rviUsers.adapter = UserAdapter(viewModel) + + initViewModel() + + } + + private fun initViewModel() { + + viewModel.apply { + + userSelected.observe(this@MainActivity, Observer { + + it?.let { + + UserDetailActivity.startActivity(it, this@MainActivity) + + } + + }) + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/app/user/UserAdapter.kt b/app/src/main/java/com/project/retoandroid/app/user/UserAdapter.kt new file mode 100644 index 0000000..d3af431 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/app/user/UserAdapter.kt @@ -0,0 +1,43 @@ +package com.project.retoandroid.app.user + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import com.project.retoandroid.data.entity.User +import com.project.retoandroid.databinding.RowUserBinding + +class UserAdapter( + private val userViewModel: UserViewModel +) : ListAdapter(User.DIFF_CALLBACK) { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + return ViewHolder.from(parent) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val user = getItem(position) + holder.bind(userViewModel, user) + } + + class ViewHolder private constructor(val binding: RowUserBinding) : RecyclerView.ViewHolder(binding.root) { + + fun bind(userViewModel: UserViewModel, user: User) { + binding.user = user + binding.viewModel = userViewModel + + binding.executePendingBindings() + } + + companion object { + + fun from(parent: ViewGroup): ViewHolder { + val layoutInflater = LayoutInflater.from(parent.context) + val binding = RowUserBinding.inflate(layoutInflater, parent, false) + return ViewHolder(binding) + } + + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/app/user/UserBinding.kt b/app/src/main/java/com/project/retoandroid/app/user/UserBinding.kt new file mode 100644 index 0000000..944048c --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/app/user/UserBinding.kt @@ -0,0 +1,13 @@ +package com.project.retoandroid.app.user + +import androidx.databinding.BindingAdapter +import androidx.recyclerview.widget.RecyclerView +import com.project.retoandroid.data.entity.User + +@BindingAdapter("users") +fun bindUser(recyclerView: RecyclerView, users: List? = emptyList()) { + users ?: return + (recyclerView.adapter as UserAdapter).apply { + submitList(users) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/app/user/UserViewModel.kt b/app/src/main/java/com/project/retoandroid/app/user/UserViewModel.kt new file mode 100644 index 0000000..7fd2e5f --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/app/user/UserViewModel.kt @@ -0,0 +1,65 @@ +package com.project.retoandroid.app.user + +import android.app.Application +import androidx.lifecycle.* +import com.project.retoandroid.app.Injection +import com.project.retoandroid.data.entity.User +import kotlinx.coroutines.launch + +class UserViewModel( + application: Application +): AndroidViewModel(application) { + + private val userRepository = Injection.provideUserRepository() + + private val _users = MutableLiveData>() + val users: LiveData> + get() = _users + + val userSelected = MutableLiveData() + + init { + + obtainUsers() + + } + + private fun obtainUsers() { + + viewModelScope.launch { + + try { + + val response = userRepository.getUsers() + _users.value = response + + } catch (e: Exception) { + e.printStackTrace() + } + + } + + } + + fun onUser(user: User) { + userSelected.value = user + } + + class Factory( + private val application: Application + ) : ViewModelProvider.NewInstanceFactory() { + + @Suppress("UNCHECKED_CAST") + override fun create(modelClass: Class): T = + with(modelClass) { + when { + isAssignableFrom(UserViewModel::class.java) -> + UserViewModel( + application, + ) + else -> throw IllegalArgumentException("Unknown ViewModel") + } + } as T + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/app/userDetail/UserDetailActivity.kt b/app/src/main/java/com/project/retoandroid/app/userDetail/UserDetailActivity.kt new file mode 100644 index 0000000..5bd71c3 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/app/userDetail/UserDetailActivity.kt @@ -0,0 +1,48 @@ +package com.project.retoandroid.app.userDetail + +import android.annotation.SuppressLint +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.databinding.DataBindingUtil +import com.project.retoandroid.R +import com.project.retoandroid.data.entity.User +import com.project.retoandroid.databinding.ActivityUserDetailBinding + +class UserDetailActivity: AppCompatActivity() { + + private lateinit var user: User + private lateinit var binding: ActivityUserDetailBinding + + companion object { + + fun startActivity(user: User, activity: Activity) { + val intent = Intent(activity.applicationContext, UserDetailActivity::class.java) + val bundle = Bundle() + bundle.putSerializable("user", user) + intent.putExtras(bundle) + activity.startActivity(intent) + } + + } + + @SuppressLint("SetTextI18n") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = DataBindingUtil.setContentView(this, R.layout.activity_user_detail) + + intent?.extras?.let { + + user = it.getSerializable("user") as User + + binding.textDetail.text = "Nombre: ${user.name}\n" + + "Correo Electrónico: ${user.email}\n" + + "Teléfono: ${user.phone}" + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/entity/Address.kt b/app/src/main/java/com/project/retoandroid/data/entity/Address.kt new file mode 100644 index 0000000..8e424b2 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/entity/Address.kt @@ -0,0 +1,15 @@ +package com.project.retoandroid.data.entity + +import java.io.Serializable + +data class Address( + val street: String, + val suite: String, + val city: String, + val geo: Coordinate +): Serializable + +data class Coordinate( + val lat: Float, + val lng: Float +): Serializable \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/entity/Company.kt b/app/src/main/java/com/project/retoandroid/data/entity/Company.kt new file mode 100644 index 0000000..47be693 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/entity/Company.kt @@ -0,0 +1,7 @@ +package com.project.retoandroid.data.entity + +import java.io.Serializable + +data class Company( + val name: String +): Serializable \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/entity/User.kt b/app/src/main/java/com/project/retoandroid/data/entity/User.kt new file mode 100644 index 0000000..9064164 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/entity/User.kt @@ -0,0 +1,32 @@ +package com.project.retoandroid.data.entity + +import androidx.recyclerview.widget.DiffUtil +import java.io.Serializable + +data class User( + val id: Int, + val name: String, + val email: String, + val phone: String, + val website: String, + val address: Address, + val company: Company +): Serializable { + + companion object { + + val DIFF_CALLBACK = object : DiffUtil.ItemCallback() { + + override fun areItemsTheSame(oldItem: User, newItem: User): Boolean { + return oldItem.id == newItem.id + } + + override fun areContentsTheSame(oldItem: User, newItem: User): Boolean { + return oldItem == newItem + } + + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/repository/UserDataSource.kt b/app/src/main/java/com/project/retoandroid/data/repository/UserDataSource.kt new file mode 100644 index 0000000..7fcbc50 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/repository/UserDataSource.kt @@ -0,0 +1,9 @@ +package com.project.retoandroid.data.repository + +import com.project.retoandroid.data.entity.User + +interface UserDataSource { + + suspend fun getUsers(): List + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/repository/UserRepository.kt b/app/src/main/java/com/project/retoandroid/data/repository/UserRepository.kt new file mode 100644 index 0000000..c618733 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/repository/UserRepository.kt @@ -0,0 +1,21 @@ +package com.project.retoandroid.data.repository + +import com.project.retoandroid.data.entity.User +import com.project.retoandroid.data.service.ApiClient + +class UserRepository : UserDataSource { + + companion object { + private var INSTANCE: UserRepository? = null + @JvmStatic fun getInstance() = INSTANCE ?: UserRepository().apply { INSTANCE = this } + } + + override suspend fun getUsers(): List { + val response = ApiClient.getTestApi().getUsers() + if (!response.isSuccessful) { + return emptyList() + } + return response.body() ?: emptyList() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/service/ApiClient.kt b/app/src/main/java/com/project/retoandroid/data/service/ApiClient.kt new file mode 100644 index 0000000..f2738a5 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/service/ApiClient.kt @@ -0,0 +1,18 @@ +package com.project.retoandroid.data.service + +import com.project.retoandroid.utils.RetrofitUtil +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +object ApiClient { + + const val url = "https://jsonplaceholder.typicode.com" + + @JvmStatic fun getTestApi() : TestApi = + Retrofit.Builder() + .baseUrl(url) + .client(RetrofitUtil.getBasicClientInterceptor()) + .addConverterFactory(GsonConverterFactory.create()) + .build().create(TestApi::class.java) + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/data/service/TestApi.kt b/app/src/main/java/com/project/retoandroid/data/service/TestApi.kt new file mode 100644 index 0000000..b3d2aec --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/data/service/TestApi.kt @@ -0,0 +1,12 @@ +package com.project.retoandroid.data.service + +import com.project.retoandroid.data.entity.User +import retrofit2.Response +import retrofit2.http.GET + +interface TestApi { + + @GET("users") + suspend fun getUsers(): Response> + +} \ No newline at end of file diff --git a/app/src/main/java/com/project/retoandroid/utils/RetrofitUtil.kt b/app/src/main/java/com/project/retoandroid/utils/RetrofitUtil.kt new file mode 100644 index 0000000..268db48 --- /dev/null +++ b/app/src/main/java/com/project/retoandroid/utils/RetrofitUtil.kt @@ -0,0 +1,25 @@ +package com.project.retoandroid.utils + +import com.project.retoandroid.BuildConfig +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor + +private const val TAG = "Retrofit" + +object RetrofitUtil { + + @Suppress("ConstantConditionIf") + @JvmStatic + fun getBasicClientInterceptor(): OkHttpClient { + + val builder = OkHttpClient.Builder() + if (BuildConfig.DEBUG) { + val logging = HttpLoggingInterceptor() + logging.level = HttpLoggingInterceptor.Level.BODY + builder.interceptors().add(logging) + } + return builder.build() + + } + +} 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 0000000..2b068d1 --- /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 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..d080b26 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml new file mode 100644 index 0000000..5db19c5 --- /dev/null +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -0,0 +1,26 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/row_user.xml b/app/src/main/res/layout/row_user.xml new file mode 100644 index 0000000..e8474f0 --- /dev/null +++ b/app/src/main/res/layout/row_user.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + \ 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 0000000..eca70cf --- /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 0000000..eca70cf --- /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 0000000..a571e60 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 0000000..61da551 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 0000000..c41dd28 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 0000000..db5080a 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 0000000..6dba46d 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 0000000..da31a87 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 0000000..15ac681 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 0000000..b216f2d 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 0000000..f25a419 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 0000000..e96783c 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 0000000..801f27a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,10 @@ + + + + \ 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 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ 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 0000000..4cd042f --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + retoAndroid + \ 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 0000000..e36ed5d --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/test/java/com/project/retoandroid/ExampleUnitTest.kt b/app/src/test/java/com/project/retoandroid/ExampleUnitTest.kt new file mode 100644 index 0000000..4bc197e --- /dev/null +++ b/app/src/test/java/com/project/retoandroid/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.project.retoandroid + +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 0000000..528ebba --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.4.21" + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:4.1.2" + 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() + jcenter() + } +} + +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 0000000..315dbf6 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +android.useAndroidX=true +android.enableJetifier=true +android.databinding.incremental=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 0000000..f6b961f 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 0000000..a9f4bc8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Mar 10 08:00:13 PET 2021 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /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 0000000..e95643d --- /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 0000000..4b43569 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "retoAndroid" \ No newline at end of file