From d1c5b25efd72f221c248556c1acb51cdda5a730a Mon Sep 17 00:00:00 2001 From: Koustubh Lapate Date: Thu, 9 Sep 2021 17:09:45 +0530 Subject: [PATCH] Koustubh modified several java files to remove some errors in the code. --- build.gradle | 2 +- .../com/fernandocejas/android10/sample/domain/User.java | 6 ++++++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../android10/sample/presentation/AndroidApplication.java | 8 ++++++++ .../presentation/view/activity/UserDetailsActivity.java | 8 +++++++- .../presentation/view/activity/UserListActivity.java | 8 ++++++++ 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d951c72d..9efc5a8c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:4.1.2' // classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' } } diff --git a/domain/src/main/java/com/fernandocejas/android10/sample/domain/User.java b/domain/src/main/java/com/fernandocejas/android10/sample/domain/User.java index 21bf5378..e2c4dd2b 100644 --- a/domain/src/main/java/com/fernandocejas/android10/sample/domain/User.java +++ b/domain/src/main/java/com/fernandocejas/android10/sample/domain/User.java @@ -31,6 +31,7 @@ public User(int userId) { private String email; private String description; private int followers; + private int phone; public int getUserId() { return userId; @@ -75,4 +76,9 @@ public int getFollowers() { public void setFollowers(int followers) { this.followers = followers; } + + public void getphone() { return phone; } + + public void setPhone(int phone) { this.phone = phone; } + } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0ca07476..580185e3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 21 17:11:04 ART 2016 +#Thu Sep 09 16:24:01 IST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/AndroidApplication.java b/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/AndroidApplication.java index 006bb115..10004afe 100644 --- a/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/AndroidApplication.java +++ b/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/AndroidApplication.java @@ -16,24 +16,32 @@ package com.fernandocejas.android10.sample.presentation; import android.app.Application; +import android.os.Build; +import android.support.annotation.RequiresApi; + import com.fernandocejas.android10.sample.presentation.internal.di.components.ApplicationComponent; import com.fernandocejas.android10.sample.presentation.internal.di.components.DaggerApplicationComponent; import com.fernandocejas.android10.sample.presentation.internal.di.modules.ApplicationModule; import com.squareup.leakcanary.LeakCanary; +import java.util.stream.DoubleStream; + /** * Android Main Application */ public class AndroidApplication extends Application { private ApplicationComponent applicationComponent; + private DoubleStream DaggerApplicationComponent; + @RequiresApi(api = Build.VERSION_CODES.N) @Override public void onCreate() { super.onCreate(); this.initializeInjector(); this.initializeLeakDetection(); } + @RequiresApi(api = Build.VERSION_CODES.N) private void initializeInjector() { this.applicationComponent = DaggerApplicationComponent.builder() .applicationModule(new ApplicationModule(this)) diff --git a/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/activity/UserDetailsActivity.java b/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/activity/UserDetailsActivity.java index f13ecf22..3f3a1a3e 100644 --- a/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/activity/UserDetailsActivity.java +++ b/presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/activity/UserDetailsActivity.java @@ -7,7 +7,9 @@ import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Bundle; +import android.support.annotation.RequiresApi; import android.view.Window; import com.fernandocejas.android10.sample.presentation.R; import com.fernandocejas.android10.sample.presentation.internal.di.HasComponent; @@ -15,6 +17,8 @@ import com.fernandocejas.android10.sample.presentation.internal.di.components.UserComponent; import com.fernandocejas.android10.sample.presentation.view.fragment.UserDetailsFragment; +import java.util.stream.DoubleStream; + /** * Activity that shows details of a certain user. */ @@ -22,6 +26,7 @@ public class UserDetailsActivity extends BaseActivity implements HasComponent, UserListFragment.UserListListener { + private DoubleStream DaggerUserComponent; + public static Intent getCallingIntent(Context context) { return new Intent(context, UserListActivity.class); } private UserComponent userComponent; + @RequiresApi(api = Build.VERSION_CODES.N) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); @@ -39,6 +46,7 @@ public static Intent getCallingIntent(Context context) { } } + @RequiresApi(api = Build.VERSION_CODES.N) private void initializeInjector() { this.userComponent = DaggerUserComponent.builder() .applicationComponent(getApplicationComponent())