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/.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..fb7f4a8 --- /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..a9f4e52 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..9d5d419 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + \ 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..7afd92d --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,63 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.gms.google-services' + id 'kotlin-parcelize' +} + +android { + compileSdk 33 + + defaultConfig { + applicationId "com.example.workingtimerv2" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +buildFeatures { + viewBinding true + dataBinding true +} +buildToolsVersion '30.0.3' +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.6.0' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + + implementation platform('com.google.firebase:firebase-bom:31.1.0') + implementation 'com.google.firebase:firebase-analytics' + implementation 'com.google.firebase:firebase-auth-ktx' + implementation 'com.google.firebase:firebase-firestore-ktx' + + var lifecycle_version = "2.5.1" + + // ViewModel + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version") + // LiveData + implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version") +} \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..aa35d11 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "740626445173", + "project_id": "workingtimer2-ac1fb", + "storage_bucket": "workingtimer2-ac1fb.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:740626445173:android:0afeb41588fd258835993c", + "android_client_info": { + "package_name": "com.example.workingtimerv2" + } + }, + "oauth_client": [ + { + "client_id": "740626445173-476d9bp8lu0ejg6r8r0pu5rsj4h8q5qv.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBBwXLw301tVINW4c9qOcG08FvgcLxxSK0" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "740626445173-476d9bp8lu0ejg6r8r0pu5rsj4h8q5qv.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ 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/example/workingtimerv2/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/workingtimerv2/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..385dc5b --- /dev/null +++ b/app/src/androidTest/java/com/example/workingtimerv2/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.workingtimerv2 + +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.workingtimerv2", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/google-services.json b/app/src/google-services.json new file mode 100644 index 0000000..aa35d11 --- /dev/null +++ b/app/src/google-services.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "740626445173", + "project_id": "workingtimer2-ac1fb", + "storage_bucket": "workingtimer2-ac1fb.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:740626445173:android:0afeb41588fd258835993c", + "android_client_info": { + "package_name": "com.example.workingtimerv2" + } + }, + "oauth_client": [ + { + "client_id": "740626445173-476d9bp8lu0ejg6r8r0pu5rsj4h8q5qv.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBBwXLw301tVINW4c9qOcG08FvgcLxxSK0" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "740626445173-476d9bp8lu0ejg6r8r0pu5rsj4h8q5qv.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ 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..bcc31f4 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/BindingAdapter.kt b/app/src/main/java/com/example/workingtimerv2/BindingAdapter.kt new file mode 100644 index 0000000..f09c455 --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/BindingAdapter.kt @@ -0,0 +1,9 @@ +package com.example.workingtimerv2 + +import androidx.databinding.BindingAdapter +import com.google.android.material.textfield.TextInputLayout + +@BindingAdapter("app:error") +fun setError (textInputLayout: TextInputLayout, error: String?) { + textInputLayout.error = error +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/DataUtils.kt b/app/src/main/java/com/example/workingtimerv2/DataUtils.kt new file mode 100644 index 0000000..20d14cc --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/DataUtils.kt @@ -0,0 +1,10 @@ +package com.example.workingtimerv2 + +import com.example.workingtimerv2.model.AppUser +import com.google.firebase.firestore.auth.User + +object DataUtils { + + var user: AppUser? = null + var firebaseUser: User? = null +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/base/BaseActivity.kt b/app/src/main/java/com/example/workingtimerv2/base/BaseActivity.kt new file mode 100644 index 0000000..0f6b339 --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/base/BaseActivity.kt @@ -0,0 +1,69 @@ +package com.example.workingtimerv2.base + +import android.app.ProgressDialog +import android.content.DialogInterface +import android.os.Bundle +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.databinding.DataBindingUtil +import androidx.databinding.ViewDataBinding + +open abstract class BaseActivity>: AppCompatActivity() { + + lateinit var viewModel:VM + lateinit var viewDataBinding: DB + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + viewDataBinding = DataBindingUtil.setContentView(this,getLayoutId()) + viewModel = initViewModel() + subscribeToLiveData() + } + + fun subscribeToLiveData(){ + viewModel.messageLiveData.observe(this) { + showDialog(it) + } + + viewModel.showLoading.observe(this) { + if (it) showLoading() + else hideLoading() + } + } + + var alertDialog : AlertDialog?= null + fun showDialog(message: String, + posActionName:String? = null, posAction: DialogInterface.OnClickListener?=null, + negActionName:String? = null, negAction: DialogInterface.OnClickListener?=null, + cancelable : Boolean = true){ + + val defAction = DialogInterface.OnClickListener { dialog, which -> dialog!!.dismiss() } + val builder = AlertDialog.Builder(this).setMessage(message) + if (posActionName!=null) builder.setPositiveButton(posActionName, posAction ?: defAction) + if (negActionName!=null) builder.setPositiveButton(negActionName, negAction ?: defAction) + builder.setCancelable(cancelable) + + alertDialog = builder.show() + } + + fun hideDialog(){ + alertDialog?.dismiss() + alertDialog = null + } + + + var progressDialog: ProgressDialog? = null + fun showLoading(){ + progressDialog = ProgressDialog(this) + progressDialog?.setMessage("Loading....") + progressDialog?.setCancelable(false) + progressDialog?.show() + } + fun hideLoading(){ + progressDialog?.dismiss() + progressDialog = null + } + + abstract fun getLayoutId():Int + abstract fun initViewModel():VM +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/base/BaseViewModel.kt b/app/src/main/java/com/example/workingtimerv2/base/BaseViewModel.kt new file mode 100644 index 0000000..7ba47d7 --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/base/BaseViewModel.kt @@ -0,0 +1,11 @@ +package com.example.workingtimerv2.base + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel + +open class BaseViewModel:ViewModel() { + + var navigator: N? = null + val showLoading = MutableLiveData() + val messageLiveData = MutableLiveData() +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/database/FirebaseUtils.kt b/app/src/main/java/com/example/workingtimerv2/database/FirebaseUtils.kt new file mode 100644 index 0000000..97abe8e --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/database/FirebaseUtils.kt @@ -0,0 +1,23 @@ +package com.example.workingtimerv2.database + +import com.example.workingtimerv2.model.AppUser +import com.google.android.gms.tasks.OnFailureListener +import com.google.android.gms.tasks.OnSuccessListener +import com.google.firebase.firestore.CollectionReference +import com.google.firebase.firestore.ktx.firestore +import com.google.firebase.ktx.Firebase + +fun getCollection (collectionName:String): CollectionReference { + val db = Firebase.firestore + return db.collection(collectionName) +} +fun addUserToFirestore(user: AppUser, + onSuccessListener: OnSuccessListener, + onFailureListener: OnFailureListener +){ + val userCollection = getCollection(AppUser.COLLECTION_NAME) + val userDoc = userCollection.document(user.id!!) + userDoc.set(user) + .addOnSuccessListener(onSuccessListener) + .addOnFailureListener(onFailureListener) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/model/AppUser.kt b/app/src/main/java/com/example/workingtimerv2/model/AppUser.kt new file mode 100644 index 0000000..7991eba --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/model/AppUser.kt @@ -0,0 +1,12 @@ +package com.example.workingtimerv2.model + +data class AppUser( + var id: String? = null, + var name: String? = null, + val email: String?= null +) +{ + companion object{ + const val COLLECTION_NAME = "users" + } +} diff --git a/app/src/main/java/com/example/workingtimerv2/ui/home/HomeActivity.kt b/app/src/main/java/com/example/workingtimerv2/ui/home/HomeActivity.kt new file mode 100644 index 0000000..e59e1db --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/ui/home/HomeActivity.kt @@ -0,0 +1,12 @@ +package com.example.workingtimerv2.ui.home + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import com.example.workingtimerv2.R + +class HomeActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_home) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/ui/register/Navigator.kt b/app/src/main/java/com/example/workingtimerv2/ui/register/Navigator.kt new file mode 100644 index 0000000..0a09e20 --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/ui/register/Navigator.kt @@ -0,0 +1,6 @@ +package com.example.workingtimerv2.ui.register + +interface Navigator { + + fun openHomeScreen() +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/ui/register/RegisterActivity.kt b/app/src/main/java/com/example/workingtimerv2/ui/register/RegisterActivity.kt new file mode 100644 index 0000000..3764b0a --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/ui/register/RegisterActivity.kt @@ -0,0 +1,33 @@ +package com.example.workingtimerv2.ui.register + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.lifecycle.ViewModelProvider +import com.example.workingtimerv2.R +import com.example.workingtimerv2.base.BaseActivity +import com.example.workingtimerv2.databinding.ActivityRegisterBinding +import com.example.workingtimerv2.ui.home.HomeActivity + + +class RegisterActivity : BaseActivity(), Navigator { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + viewDataBinding.vm = viewModel + viewModel.navigator = this + } + + override fun getLayoutId(): Int { + return R.layout.activity_register + } + + override fun initViewModel(): RegisterViewModel { + return ViewModelProvider(this).get(RegisterViewModel::class.java) + } + + override fun openHomeScreen() { + val intent = Intent(this, HomeActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/ui/register/RegisterViewModel.kt b/app/src/main/java/com/example/workingtimerv2/ui/register/RegisterViewModel.kt new file mode 100644 index 0000000..289cf6e --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/ui/register/RegisterViewModel.kt @@ -0,0 +1,82 @@ +package com.example.workingtimerv2.ui.register + +import android.util.Log +import androidx.databinding.ObservableField +import com.example.workingtimerv2.DataUtils +import com.example.workingtimerv2.base.BaseViewModel +import com.example.workingtimerv2.database.addUserToFirestore +import com.example.workingtimerv2.model.AppUser +import com.google.firebase.auth.ktx.auth +import com.google.firebase.ktx.Firebase + +class RegisterViewModel: BaseViewModel() { + + val name = ObservableField() + val nameError = ObservableField() + val email = ObservableField() + val emailError = ObservableField() + val password = ObservableField() + val passwordError = ObservableField() + private val auth = Firebase.auth + + fun createAccount(){ + Log.e("click" , "createAccount") + if (validate()){ + addAccountToFirebase() + } + } + + private fun addAccountToFirebase() { + showLoading.value = true + auth.createUserWithEmailAndPassword(email.get()!!, password.get()!!) + .addOnCompleteListener { task-> + showLoading.value = false + if (!task.isSuccessful) { + //show error message + messageLiveData.value = task.exception!!.localizedMessage + } else { + //show success message + messageLiveData.value = "success registration" + //navigator?.openHomeScreen() + createFirestoreUser(task.result.user?.uid) + } + } + } + + private fun createFirestoreUser(uid: String?) { + showLoading.value = false + val user = AppUser(name = name.get(), + email = email.get()) + addUserToFirestore(user, { + showLoading.value = false + DataUtils.user = user + navigator?.openHomeScreen() + }, { + showLoading.value = false + messageLiveData.value = it.localizedMessage + }) + } + + private fun validate(): Boolean { + var valid = true + if (name.get().isNullOrBlank()){ + nameError.set("Enter name") + valid = false + } else { + nameError.set(null) + } + if (email.get().isNullOrBlank()){ + emailError.set("Enter email") + valid = false + } else { + emailError.set(null) + } + if (password.get().isNullOrBlank()){ + passwordError.set("Enter password") + valid = false + } else { + passwordError.set(null) + } + return valid + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/workingtimerv2/ui/splash/SplashActivity.kt b/app/src/main/java/com/example/workingtimerv2/ui/splash/SplashActivity.kt new file mode 100644 index 0000000..fed2fbf --- /dev/null +++ b/app/src/main/java/com/example/workingtimerv2/ui/splash/SplashActivity.kt @@ -0,0 +1,12 @@ +package com.example.workingtimerv2.ui.splash + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import com.example.workingtimerv2.R + +class SplashActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_splash) + } +} \ 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 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/background.png b/app/src/main/res/drawable/background.png new file mode 100644 index 0000000..c1e6fe3 Binary files /dev/null and b/app/src/main/res/drawable/background.png differ diff --git a/app/src/main/res/drawable/button_background_color.xml b/app/src/main/res/drawable/button_background_color.xml new file mode 100644 index 0000000..4b8e924 --- /dev/null +++ b/app/src/main/res/drawable/button_background_color.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/holder.png b/app/src/main/res/drawable/holder.png new file mode 100644 index 0000000..f462e6b Binary files /dev/null and b/app/src/main/res/drawable/holder.png differ 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_home.xml b/app/src/main/res/layout/activity_home.xml new file mode 100644 index 0000000..abc1cb5 --- /dev/null +++ b/app/src/main/res/layout/activity_home.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml new file mode 100644 index 0000000..1f5a5e0 --- /dev/null +++ b/app/src/main/res/layout/activity_register.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +