diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.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 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..88ea3aa --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..169fd0d --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..97e8e4d --- /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 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /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 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..a2e6da2 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,48 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' +apply plugin: 'com.google.gms.google-services' + +android { + compileSdkVersion 29 + defaultConfig { + applicationId "com.dawar.sparknetwork" + minSdkVersion 23 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0' + implementation 'com.google.firebase:firebase-database:19.2.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + // For activity rules + androidTestImplementation 'androidx.test:rules:1.2.0' + // for fragment testing + implementation 'androidx.fragment:fragment-testing:1.2.0-rc01' + + implementation 'com.github.bumptech.glide:glide:4.9.0' + + // or Koin for Android Architecture ViewModel + implementation 'org.koin:koin-androidx-viewmodel:2.0.1' + +} diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..dbdf65c --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "936486760126", + "firebase_url": "https://sparknetwork-8a4c5.firebaseio.com", + "project_id": "sparknetwork-8a4c5", + "storage_bucket": "sparknetwork-8a4c5.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:936486760126:android:a9dba482344d1eb41978ef", + "android_client_info": { + "package_name": "com.dawar.sparknetwork" + } + }, + "oauth_client": [ + { + "client_id": "936486760126-fecc7vl57bisjd2mvfo7ivvbs9pu1phn.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "com.dawar.sparknetwork", + "certificate_hash": "97766a16950abdbc0f2be1ef5f8828248d26bd96" + } + }, + { + "client_id": "936486760126-tpp36861fk3lb56dkj42i98egvt902k6.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBJIhTaoBwdWVBjLo4G52qCGscQP8innuE" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "936486760126-tpp36861fk3lb56dkj42i98egvt902k6.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..f1b4245 --- /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 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1c87f0e --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/dawar/sparknetwork/models/User.kt b/app/src/main/java/com/dawar/sparknetwork/models/User.kt new file mode 100644 index 0000000..3b09376 --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/models/User.kt @@ -0,0 +1,12 @@ +package com.dawar.sparknetwork.models + + +data class User(var name: String? = null) { + var image: String? = null + var phone: String? = null + var email: String? = null + + var address: String? = null +} + + diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseFragment.kt b/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseFragment.kt new file mode 100644 index 0000000..a500f83 --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseFragment.kt @@ -0,0 +1,5 @@ +package com.dawar.sparknetwork.ui.main + +import androidx.fragment.app.Fragment + +abstract class BaseFragment:Fragment() \ No newline at end of file diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseRepository.kt b/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseRepository.kt new file mode 100644 index 0000000..65a29f8 --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseRepository.kt @@ -0,0 +1,7 @@ +package com.dawar.sparknetwork.ui.main + +import com.dawar.sparknetwork.ui.main.database.AppDatabase + +abstract class BaseRepository { + protected val mAppDatabase = AppDatabase.getInstance() +} diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseViewModel.kt b/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseViewModel.kt new file mode 100644 index 0000000..4ecf435 --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/main/BaseViewModel.kt @@ -0,0 +1,34 @@ +package com.dawar.sparknetwork.ui.main + +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModel + +/** + * An abstract Base View model to share common behavior and additionally clear navigation reference upon invalidation. + */ +abstract class BaseViewModel : ViewModel() { + private var view: View? = null + + /** + * This method must be called by the UI to attach navigation to be monitored by the substituted view model to respond to UI specific event changes. + * @param navigator reference to navigation + */ + open fun attachView(view: View, lifecycleOwner: LifecycleOwner) { + this.view = view + } + + /** + * @returns current navigator if attached + * @throws NullPointerException if not attached. + */ + protected fun getView(): View { + if (view == null) + throw NullPointerException("View is null please call attach method 1st") + + return view!! + } + + override fun onCleared() { + view = null + } +} \ No newline at end of file diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/main/MainActivity.kt b/app/src/main/java/com/dawar/sparknetwork/ui/main/MainActivity.kt new file mode 100644 index 0000000..baf1dcc --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/main/MainActivity.kt @@ -0,0 +1,56 @@ +package com.dawar.sparknetwork.ui.main + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import com.dawar.sparknetwork.R +import com.dawar.sparknetwork.ui.profile.ProfileFragment +import com.dawar.sparknetwork.ui.profile.ProfileRepository +import com.dawar.sparknetwork.ui.profile.ProfileViewModel +import org.koin.android.ext.koin.androidContext +import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.context.startKoin +import org.koin.dsl.module + +class MainActivity : AppCompatActivity() { + + lateinit var profileFragment: ProfileFragment + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + initKoin() + setContentView(R.layout.main_activity) + launchProfileFragment() + + } + + private fun initKoin() { + val myModule = module { + viewModel { + ProfileViewModel(get()) + } + single { + ProfileRepository.getInstance() + } + + } + // start Koin! + startKoin { + // declare used Android context + androidContext(applicationContext) + // declare modules + modules(myModule) + } + } + + private fun launchProfileFragment() { + profileFragment = ProfileFragment.newInstance() + supportFragmentManager.beginTransaction() + .replace( + R.id.container, + profileFragment + ) + .commitNow() + } + +} diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/main/database/AppDatabase.kt b/app/src/main/java/com/dawar/sparknetwork/ui/main/database/AppDatabase.kt new file mode 100644 index 0000000..b784d8c --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/main/database/AppDatabase.kt @@ -0,0 +1,61 @@ +package com.dawar.sparknetwork.ui.main.database + +import com.dawar.sparknetwork.models.User +import com.google.firebase.database.DataSnapshot +import com.google.firebase.database.DatabaseError +import com.google.firebase.database.FirebaseDatabase +import com.google.firebase.database.ValueEventListener + +class AppDatabase private constructor() { + + private val database = FirebaseDatabase.getInstance() + private val dbRootRef = database.reference + private val userNode = dbRootRef.child("Users") + private lateinit var onUser: ((User?) -> Unit) + private lateinit var userId: String + + private val valueEventListener = object : ValueEventListener { + override fun onDataChange(p0: DataSnapshot) { + val user = p0.child(userId).getValue(User::class.java) + onUser(user) + close() + } + + override fun onCancelled(p0: DatabaseError) { + onUser(null) + close() + } + } + + fun saveUser(user: User, onSuccess: ((Boolean) -> Unit)? = null) { + + userNode.child("SN-1").setValue(user) + .addOnCompleteListener { + onSuccess?.invoke(it.isSuccessful) + } + } + + + fun getUser(id: String, onUser: ((User?) -> Unit)) { + this.onUser = onUser + this.userId = id + userNode.addValueEventListener(valueEventListener) + + } + + private fun close() { + userNode.removeEventListener(valueEventListener) + } + + companion object { + private var appDatabase: AppDatabase? = null + + fun getInstance(): AppDatabase { + if (appDatabase == null) + appDatabase = + AppDatabase() + return appDatabase!! + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileFragment.kt b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileFragment.kt new file mode 100644 index 0000000..75c1d4e --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileFragment.kt @@ -0,0 +1,71 @@ +package com.dawar.sparknetwork.ui.profile + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.lifecycle.ViewModelProviders +import com.dawar.sparknetwork.R +import com.dawar.sparknetwork.models.User +import com.dawar.sparknetwork.ui.main.BaseFragment +import kotlinx.android.synthetic.main.profile_fragment.* +import org.koin.androidx.viewmodel.ext.android.viewModel + +class ProfileFragment : BaseFragment(), ProfileView { + val mProfileViewModel: ProfileViewModel by viewModel() + + companion object { + fun newInstance() = ProfileFragment() + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + // mProfileViewModel = ViewModelProviders.of(this)[ProfileViewModel::class.java] + mProfileViewModel.attachView(this, this) + mProfileViewModel.getProfile("SN-1") + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.profile_fragment, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + btnSubmit.setOnClickListener { + submitUser() + } + enableSubmitButton(false) + } + + private fun submitUser() { + val user = User(etName.text.toString()) + user.address = etAddress.text.toString() + user.email = etEmail.text.toString() + user.phone = etPhone.text.toString() + mProfileViewModel.saveProfile(user) + enableSubmitButton(false) + + + } + + private fun enableSubmitButton(enabled: Boolean) { + btnSubmit.isEnabled = enabled + btnSubmit.setText(if (enabled) R.string.submit else R.string.loading) + } + + override fun onUser(user: User?) { + etAddress.setText(user?.address) + etName.setText(user?.name) + etPhone.setText(user?.phone) + etEmail.setText(user?.email) + btnSubmit.setText(R.string.submit) + enableSubmitButton(true) + } + + override fun onUserSaved(success: Boolean) { + enableSubmitButton(true) + } +} diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileRepository.kt b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileRepository.kt new file mode 100644 index 0000000..2c74f0d --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileRepository.kt @@ -0,0 +1,31 @@ +package com.dawar.sparknetwork.ui.profile + +import com.dawar.sparknetwork.models.User +import com.dawar.sparknetwork.ui.main.BaseRepository + + +/** + * The repository handling database operations for profile flow. + */ +class ProfileRepository private constructor() : BaseRepository() { + + + fun getUserProfile(id: String, onUser: ((User?) -> Unit)) { + mAppDatabase.getUser(id, onUser) + } + + fun saveProfile(user: User, onSuccess: ((Boolean) -> Unit)? = null) { + mAppDatabase.saveUser(user, onSuccess) + } + + + companion object { + private var instance: ProfileRepository? = null + + fun getInstance(): ProfileRepository { + if (instance == null) + instance = ProfileRepository() + return instance!! + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileView.kt b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileView.kt new file mode 100644 index 0000000..50a6835 --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileView.kt @@ -0,0 +1,11 @@ +package com.dawar.sparknetwork.ui.profile + +import com.dawar.sparknetwork.models.User + +/** + * View for ChangePhoneNumberFragment. + */ +interface ProfileView { + fun onUserSaved(success: Boolean) + fun onUser(user: User?) +} \ No newline at end of file diff --git a/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileViewModel.kt b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileViewModel.kt new file mode 100644 index 0000000..a4fa907 --- /dev/null +++ b/app/src/main/java/com/dawar/sparknetwork/ui/profile/ProfileViewModel.kt @@ -0,0 +1,50 @@ +package com.dawar.sparknetwork.ui.profile + +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import com.dawar.sparknetwork.models.User +import com.dawar.sparknetwork.ui.main.BaseViewModel + +class ProfileViewModel(private val mProfileRepository: ProfileRepository) : BaseViewModel() { + + + private val mMutableProfileData = MutableLiveData() + private val mProfileDataSaved = MutableLiveData() + private val mUserObserver: Observer = Observer { + getView().onUser(it) + } + private val mUserDataUpdateObserver: Observer = Observer { + getView().onUserSaved(it) + } + + fun getProfile(id: String) { + + mProfileRepository.getUserProfile(id) { + mMutableProfileData.postValue(it) + } + } + + fun saveProfile(user: User) { + mProfileRepository.saveProfile(user) { + mProfileDataSaved.postValue(it) + } + } + + override fun attachView(view: ProfileView, lifecycleOwner: LifecycleOwner) { + super.attachView(view, lifecycleOwner) + + mMutableProfileData.observe(lifecycleOwner, mUserObserver) + + mProfileDataSaved.observe(lifecycleOwner, mUserDataUpdateObserver) + + } + + + override fun onCleared() { + super.onCleared() + mMutableProfileData.removeObserver(mUserObserver) + mProfileDataSaved.removeObserver(mUserDataUpdateObserver) + + } +} \ 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..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + 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..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml new file mode 100644 index 0000000..fa6fed4 --- /dev/null +++ b/app/src/main/res/layout/main_activity.xml @@ -0,0 +1,7 @@ + + diff --git a/app/src/main/res/layout/profile_fragment.xml b/app/src/main/res/layout/profile_fragment.xml new file mode 100644 index 0000000..8774c7b --- /dev/null +++ b/app/src/main/res/layout/profile_fragment.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + +