Feature/addcodeverification

README.md

@@ -0,0 +1,27 @@
+# peacock
+
+![peacock](https://user-images.githubusercontent.com/31917346/61375032-123b4f80-a8b3-11e9-8cdd-0e41947ecb1c.jpg)
+
+Setting up development Environment
+----------------------------------
+
+### Installing Dependencies
+
+    JDK
+    SDK
+
+### Setup Android environment
+
+    Install Android Studio and config JDK and SDK.
+
+#### Upgrade SKD, BuildTool and etc.
+
+    Sync gradle and install what it needs.
+
+### Debug Mode
+
+    Run project on device/emulator.
+
+### Release Mode
+
+    Run project on device/emulator.

app/build.gradle

@@ -1,8 +1,17 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "androidx.navigation.safeargs.kotlin"
+apply plugin: 'kotlin-kapt'
+
+ext.versionMajor = 00
+ext.versionMinor = 00
+ext.versionPatch = 01
+ext.versionClassifier = null
+ext.isSnapshot = false
+ext.minimumSdkVersion = 17
+ext.minimumScreenSize = 1
+ext.maximumScreenSize = 4
 
 android {
     compileSdkVersion 29
@@ -11,24 +20,89 @@ android {
         applicationId "de.netalic.peacock"
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode generateVersionCode()
+        versionName generateVersionName()
+        vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+}
+
+
+private Integer generateVersionCode() {
+    return ext.minimumSdkVersion * 100000000 + ext.minimumScreenSize * 10000000 + ext.maximumScreenSize * 1000000 + ext.versionMajor * 10000 + ext.versionMinor * 100 + ext.versionPatch
+}
+
+private String generateVersionName() {
+    String versionName = "${ext.versionMajor}.${ext.versionMinor}.${ext.versionPatch}"
+    if (ext.versionClassifier == null) {
+        if (ext.isSnapshot) {
+            ext.versionClassifier = "SNAPSHOT"
+        }
+    }
+
+    if (ext.versionClassifier != null) {
+        versionName += "-" + ext.versionClassifier
+    }
+    return versionName
+}
+
+repositories {
+    mavenCentral()
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'com.google.android.material:material:1.1.0-alpha08'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0-beta02'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0-beta02'
+    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "org.koin:koin-android:2.0.1"
+    implementation "org.koin:koin-android-viewmodel:2.0.1"
+    implementation 'com.mikhaellopez:circularimageview:4.0.1'
+    implementation 'com.github.EhsanMashhadi:CountryPicker:0.4.0'
+    implementation "com.squareup.retrofit2:retrofit:2.6.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.6.0"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0'
+    implementation "android.arch.lifecycle:extensions:1.1.1"
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.2.0'
+
     testImplementation 'junit:junit:4.12'
+    testImplementation "org.mockito:mockito-inline:3.0.0"
+    testImplementation 'org.koin:koin-test:2.0.1'
+    testImplementation "android.arch.core:core-testing:1.1.1"
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
+
+
+    implementation ('com.alimuzaffar.lib:pinentryedittext:2.0.6') {
+        exclude group: 'androidx.appcompat', module: 'appcompat'
+    }
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+
+    implementation 'com.github.EhsanMashhadi:helpdroid:0.9.0'
+    implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
+}

app/src/androidTest/java/de/netalic/peacock/ExampleInstrumentedTest.kt

@@ -2,12 +2,10 @@ package de.netalic.peacock
 
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
-
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -1,10 +1,30 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="de.netalic.peacock">
-
-    <application android:allowBackup="true"
-                 android:label="@string/app_name"
-                 android:icon="@mipmap/ic_launcher"
-                 android:roundIcon="@mipmap/ic_launcher_round"
-                 android:supportsRtl="true"
-                 android:theme="@style/AppTheme"/>
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        package="de.netalic.peacock">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application
+            android:allowBackup="true"
+            android:name=".common.MyApplication"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme"
+            tools:ignore="GoogleAppIndexingWarning">
+
+        <activity
+                android:name=".ui.main.MainHostActivity"
+                android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

app/src/main/java/de/netalic/peacock/common/MyApplication.kt

@@ -0,0 +1,43 @@
+package de.netalic.peacock.common
+
+import android.app.Application
+import de.netalic.peacock.BuildConfig
+import de.netalic.peacock.di.apiModule
+import de.netalic.peacock.di.repositoryModule
+import de.netalic.peacock.di.viewModelModule
+import okhttp3.internal.Internal.instance
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import timber.log.Timber
+
+class MyApplication : Application() {
+
+
+    override fun onCreate() {
+        super.onCreate()
+
+        instance = this
+
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+        startKoin {
+            androidLogger()
+            androidContext(this@MyApplication)
+            modules(
+                listOf(
+                    repositoryModule,
+                    viewModelModule,
+                    apiModule
+                )
+            )
+        }
+    }
+
+    companion object {
+
+        lateinit var instance: Application
+    }
+
+}

app/src/main/java/de/netalic/peacock/data/exception/ActivationCodeIsNotValid.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class ActivationCodeIsNotValid :Throwable()

app/src/main/java/de/netalic/peacock/data/exception/BadRequestException.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class BadRequestException : BaseException()

app/src/main/java/de/netalic/peacock/data/exception/BaseException.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+open class BaseException:Throwable()

app/src/main/java/de/netalic/peacock/data/exception/InvalidDeviceName.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class InvalidDeviceName:Throwable()

app/src/main/java/de/netalic/peacock/data/exception/InvalidPhoneNumberException.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class InvalidPhoneNumberException:BaseException()

app/src/main/java/de/netalic/peacock/data/exception/InvalidUdidOrPhone.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class InvalidUdidOrPhone :Throwable()

app/src/main/java/de/netalic/peacock/data/exception/InvalidUdidOrPhoneException.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class InvalidUdidOrPhoneException : BaseException()

app/src/main/java/de/netalic/peacock/data/exception/ServerException.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.exception
+
+class ServerException : BaseException()

app/src/main/java/de/netalic/peacock/data/model/MyResponse.kt

@@ -0,0 +1,29 @@
+package de.netalic.peacock.data.model
+
+data class MyResponse<T>(
+    val status: Status,
+    val data: T? = null,
+    val throwable: Throwable? = null
+) {
+
+    companion object {
+
+        fun <T> loading(): MyResponse<T> {
+            return MyResponse(status = Status.LOADING)
+        }
+
+        fun <T> success(data: T): MyResponse<T> {
+            return MyResponse(status = Status.SUCCESS, data = data)
+        }
+
+        fun <T> failed(throwable: Throwable): MyResponse<T> {
+            return MyResponse(status = Status.FAILED, throwable = throwable)
+        }
+    }
+}
+
+enum class Status {
+    LOADING,
+    SUCCESS,
+    FAILED
+}

app/src/main/java/de/netalic/peacock/data/model/UserModel.kt

@@ -0,0 +1,13 @@
+package de.netalic.peacock.data.model
+
+import com.google.gson.annotations.SerializedName
+
+data class UserModel(
+    @SerializedName("id") val mId: String? = null,
+    @SerializedName("name") val mName: String? = null,
+    @SerializedName("phone") val mPhone: String,
+    @SerializedName("udid") val mUdid: String,
+    @SerializedName("firebaseToken") val mFirebaseToken: String = "",
+    val mActivateToken:String,
+    val mDeviceType:String
+)

app/src/main/java/de/netalic/peacock/data/repository/BaseRepository.kt

@@ -0,0 +1,3 @@
+package de.netalic.peacock.data.repository
+
+open class BaseRepository

app/src/main/java/de/netalic/peacock/data/repository/UserRepository.kt

@@ -0,0 +1,21 @@
+package de.netalic.peacock.data.repository
+
+import de.netalic.peacock.data.model.UserModel
+import de.netalic.peacock.data.webservice.ApiInterface
+import io.reactivex.Single
+import okhttp3.ResponseBody
+import retrofit2.Response
+
+class UserRepository(private val apiInterface: ApiInterface) : BaseRepository() {
+
+
+    fun claim(phone: String, udid: String): Single<Response<UserModel>> {
+        return apiInterface.claim(phone, udid)
+    }
+
+    fun bind(user:UserModel) :Single<Response<ResponseBody>>{
+
+        return apiInterface.bind(user.mPhone,user.mUdid, user.mName!!,user.mDeviceType,user.mFirebaseToken,
+            user.mActivateToken)
+    }
+}