From 9d3ac91d8a6c676c918b797a1b1c94dd7fab8a31 Mon Sep 17 00:00:00 2001 From: Jaro Habr Date: Wed, 5 Sep 2018 12:23:22 +0200 Subject: [PATCH 1/5] Refactorings --- .../pathshare/example/MainActivity.kt | 10 +++----- .../pathshare/example/MainActivity.java | 25 +++++++++++++++---- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt b/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt index 70c3c56..30ef4c3 100644 --- a/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt +++ b/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt @@ -35,11 +35,6 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - createButton = findViewById(R.id.create_session) as Button - joinButton = findViewById(R.id.join_session) as Button - inviteButton = findViewById(R.id.invite_customer) as Button - leaveButton = findViewById(R.id.leave_session) as Button - initializeCreateButton() initializeJoinButton() initializeInviteButton() @@ -49,6 +44,7 @@ class MainActivity : AppCompatActivity() { } private fun initializeCreateButton() { + createButton = findViewById(R.id.create_session) as Button createButton.isEnabled = true createButton.setOnClickListener { Pathshare.client().saveUser("SDK User Android", "+12345678901", UserType.DRIVER, object: ResponseListener { @@ -65,16 +61,19 @@ class MainActivity : AppCompatActivity() { } private fun initializeJoinButton() { + joinButton = findViewById(R.id.join_session) as Button joinButton.isEnabled = false joinButton.setOnClickListener { joinSession() } } private fun initializeInviteButton() { + inviteButton = findViewById(R.id.invite_customer) as Button inviteButton.isEnabled = false inviteButton.setOnClickListener { inviteCustomer() } } private fun initializeLeaveButton() { + leaveButton = findViewById(R.id.leave_session) as Button leaveButton.isEnabled = false leaveButton.setOnClickListener { leaveSession() } } @@ -225,7 +224,6 @@ class MainActivity : AppCompatActivity() { deleteSessionIdentifier() showToast("Session expired") } - } private fun showToast(message: String) { diff --git a/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java b/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java index ca8676c..be055eb 100644 --- a/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java +++ b/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java @@ -41,11 +41,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - mCreateButton = findViewById(R.id.create_session); - mJoinButton = findViewById(R.id.join_session); - mInviteButton = findViewById(R.id.invite_customer); - mLeaveButton = findViewById(R.id.leave_session); - initializeCreateButton(); initializeJoinButton(); initializeInviteButton(); @@ -55,6 +50,7 @@ protected void onCreate(Bundle savedInstanceState) { } private void initializeCreateButton() { + setCreateButton((Button) findViewById(R.id.create_session)); getCreateButton().setEnabled(true); getCreateButton().setOnClickListener(new View.OnClickListener() { @Override @@ -76,6 +72,7 @@ public void onError() { } private void initializeJoinButton() { + setJoinButton((Button) findViewById(R.id.join_session)); getJoinButton().setEnabled(false); getJoinButton().setOnClickListener(new View.OnClickListener() { @Override @@ -86,6 +83,7 @@ public void onClick(View v) { } private void initializeInviteButton() { + setInviteButton((Button) findViewById(R.id.invite_customer)); getInviteButton().setEnabled(false); getInviteButton().setOnClickListener(new View.OnClickListener() { @Override @@ -96,6 +94,7 @@ public void onClick(View v) { } private void initializeLeaveButton() { + setLeaveButton((Button) findViewById(R.id.leave_session)); getLeaveButton().setEnabled(false); getLeaveButton().setOnClickListener(new View.OnClickListener() { @Override @@ -281,6 +280,22 @@ public Session getSession() { return mSession; } + public void setCreateButton(Button createButton) { + this.mCreateButton = createButton; + } + + public void setJoinButton(Button joinButton) { + this.mJoinButton = joinButton; + } + + public void setInviteButton(Button inviteButton) { + this.mInviteButton = inviteButton; + } + + public void setLeaveButton(Button leaveButton) { + this.mLeaveButton = leaveButton; + } + public Button getCreateButton() { return mCreateButton; } From f64c8df305cc342a1c7cdcdafc31ae35ce10c3b0 Mon Sep 17 00:00:00 2001 From: Jaro Habr Date: Mon, 10 Sep 2018 18:43:37 +0200 Subject: [PATCH 2/5] Add email address to user (nullable) --- .../main/java/ch/freshbits/pathshare/example/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt b/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt index 30ef4c3..1b79653 100644 --- a/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt +++ b/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt @@ -47,7 +47,7 @@ class MainActivity : AppCompatActivity() { createButton = findViewById(R.id.create_session) as Button createButton.isEnabled = true createButton.setOnClickListener { - Pathshare.client().saveUser("SDK User Android", "+12345678901", UserType.DRIVER, object: ResponseListener { + Pathshare.client().saveUser("SDK User Android", "me@email.com", "+12345678901", UserType.DRIVER, object: ResponseListener { override fun onSuccess() { Log.d("User", "Success") createSession() From 3c0c9173f0c15865a974b5ba67ddd88c6a50737f Mon Sep 17 00:00:00 2001 From: Jaro Habr Date: Mon, 10 Sep 2018 18:44:12 +0200 Subject: [PATCH 3/5] Bump versions --- android-example-app/app-kotlin/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android-example-app/app-kotlin/build.gradle b/android-example-app/app-kotlin/build.gradle index 99f632e..bc16970 100644 --- a/android-example-app/app-kotlin/build.gradle +++ b/android-example-app/app-kotlin/build.gradle @@ -8,8 +8,8 @@ android { applicationId "ch.freshbits.pathshare.example" minSdkVersion 21 targetSdkVersion 27 - versionCode 2_1_0 - versionName "2.1.0" + versionCode 2_2_0 + versionName "2.2.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -41,7 +41,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.1.0' + implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.2.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:27.1.1' } From 901912d2682e9f29ecb201b4fbf7524f6d46004c Mon Sep 17 00:00:00 2001 From: Jaro Habr Date: Mon, 10 Sep 2018 18:47:51 +0200 Subject: [PATCH 4/5] Add email to user --- .../main/java/ch/freshbits/pathshare/example/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java b/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java index be055eb..85b8b43 100644 --- a/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java +++ b/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java @@ -55,7 +55,7 @@ private void initializeCreateButton() { getCreateButton().setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Pathshare.client().saveUser("SDK User", "+12345678901", UserType.DRIVER, new ResponseListener() { + Pathshare.client().saveUser("SDK User", "me@email.com", "+12345678901", UserType.DRIVER, new ResponseListener() { @Override public void onSuccess() { Log.d("User", "Success"); From fe6333f19b66c075466a5d83aacc1fd51cc4b7c4 Mon Sep 17 00:00:00 2001 From: Jaro Habr Date: Mon, 10 Sep 2018 18:48:20 +0200 Subject: [PATCH 5/5] Bump versions --- android-example-app/app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android-example-app/app/build.gradle b/android-example-app/app/build.gradle index 1ffbee3..d3c9308 100644 --- a/android-example-app/app/build.gradle +++ b/android-example-app/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "ch.freshbits.pathshare.example" minSdkVersion 25 targetSdkVersion 27 - versionCode 2_1_0 - versionName "2.1.0" + versionCode 2_2_0 + versionName "2.2.0" } lintOptions { @@ -40,5 +40,5 @@ dependencies { testCompile 'junit:junit:4.12' //noinspection GradleCompatible compile 'com.android.support:appcompat-v7:27.1.1' - compile 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.1.0' + compile 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.2.0' }