Skip to content
This repository was archived by the owner on Dec 11, 2024. It is now read-only.

Commit 4094f04

Browse files
committed
Bumps versions for Studio AFox
1 parent ede9ac0 commit 4094f04

File tree

9 files changed

+27
-39
lines changed

9 files changed

+27
-39
lines changed

app/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ dependencies {
3131

3232
// App dependencies
3333
implementation "androidx.appcompat:appcompat:$appCompatVersion"
34-
implementation "androidx.cardview:cardview:$cardVersion"
34+
implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipeRefreshLayoutVersion"
3535
implementation "com.google.android.material:material:$materialVersion"
3636
implementation "androidx.recyclerview:recyclerview:$recyclerViewVersion"
3737
implementation "androidx.annotation:annotation:$androidXAnnotations"
3838
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
3939
implementation "com.jakewharton.timber:timber:$timberVersion"
40-
implementation "androidx.legacy:legacy-support-v4:$androidXLegacySupport"
4140

4241
// Architecture Components
4342
implementation "androidx.room:room-runtime:$roomVersion"

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<activity
2929
android:name="com.example.android.architecture.blueprints.todoapp.tasks.TasksActivity"
3030
android:windowSoftInputMode="adjustResize"
31-
android:theme="@style/AppTheme.OverlapSystemBar">
31+
android:theme="@style/AppTheme.OverlapSystemBar"
32+
android:exported="true">
3233
<intent-filter>
3334
<action android:name="android.intent.action.MAIN" />
3435
<category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AddEditTaskFragment : Fragment() {
4545
override fun onCreateView(
4646
inflater: LayoutInflater, container: ViewGroup?,
4747
savedInstanceState: Bundle?
48-
): View? {
48+
): View {
4949
val root = inflater.inflate(R.layout.addtask_frag, container, false)
5050
viewDataBinding = AddtaskFragBinding.bind(root).apply {
5151
this.viewmodel = viewModel
@@ -55,8 +55,7 @@ class AddEditTaskFragment : Fragment() {
5555
return viewDataBinding.root
5656
}
5757

58-
override fun onActivityCreated(savedInstanceState: Bundle?) {
59-
super.onActivityCreated(savedInstanceState)
58+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
6059
setupSnackbar()
6160
setupNavigation()
6261
this.setupRefreshLayout(viewDataBinding.refreshLayout)

app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsFragment.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ class StatisticsFragment : Fragment() {
4646
return viewDataBinding.root
4747
}
4848

49-
override fun onActivityCreated(savedInstanceState: Bundle?) {
50-
super.onActivityCreated(savedInstanceState)
49+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
5150
viewDataBinding.viewmodel = viewModel
5251
viewDataBinding.lifecycleOwner = this.viewLifecycleOwner
5352
this.setupRefreshLayout(viewDataBinding.refreshLayout)

app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ class TaskDetailFragment : Fragment() {
4444

4545
private val viewModel by viewModels<TaskDetailViewModel>()
4646

47-
override fun onActivityCreated(savedInstanceState: Bundle?) {
48-
super.onActivityCreated(savedInstanceState)
47+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
4948
setupFab()
50-
view?.setupSnackbar(this, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
49+
view.setupSnackbar(this, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
5150
setupNavigation()
5251
this.setupRefreshLayout(viewDataBinding.refreshLayout)
5352
}

app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class TasksActivity : AppCompatActivity() {
4545
val navController: NavController = findNavController(R.id.nav_host_fragment)
4646
appBarConfiguration =
4747
AppBarConfiguration.Builder(R.id.tasks_fragment_dest, R.id.statistics_fragment_dest)
48-
.setDrawerLayout(drawerLayout)
48+
.setOpenableLayout(drawerLayout)
4949
.build()
5050
setupActionBarWithNavController(navController, appBarConfiguration)
5151
findViewById<NavigationView>(R.id.nav_view)

app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TasksFragment : Fragment() {
5454
override fun onCreateView(
5555
inflater: LayoutInflater, container: ViewGroup?,
5656
savedInstanceState: Bundle?
57-
): View? {
57+
): View {
5858
viewDataBinding = TasksFragBinding.inflate(inflater, container, false).apply {
5959
viewmodel = viewModel
6060
}
@@ -83,9 +83,7 @@ class TasksFragment : Fragment() {
8383
inflater.inflate(R.menu.tasks_fragment_menu, menu)
8484
}
8585

86-
override fun onActivityCreated(savedInstanceState: Bundle?) {
87-
super.onActivityCreated(savedInstanceState)
88-
86+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
8987
// Set the lifecycle owner to the lifecycle of the view
9088
viewDataBinding.lifecycleOwner = this.viewLifecycleOwner
9189
setupSnackbar()

build.gradle

+15-22
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlinVersion = '1.5.10'
2+
ext.kotlinVersion = '1.5.31'
33
ext.navigationVersion = '2.3.5'
44
repositories {
55
google()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.2.1'
9+
classpath 'com.android.tools.build:gradle:7.0.3'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1111
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
1212

@@ -26,33 +26,26 @@ allprojects {
2626
ext {
2727
// Sdk and tools
2828
minSdkVersion = 21
29-
targetSdkVersion = 30
30-
compileSdkVersion = 30
29+
targetSdkVersion = 31
30+
compileSdkVersion = 31
3131

3232
// App dependencies
3333
androidXVersion = '1.0.0'
3434
androidXTestCoreVersion = '1.3.0'
35-
androidXTestExtKotlinRunnerVersion = '1.1.2'
35+
androidXTestExtKotlinRunnerVersion = '1.1.3'
3636
androidXTestRulesVersion = '1.2.0'
37-
androidXAnnotations = '1.2.0'
38-
androidXLegacySupport = '1.0.0'
39-
appCompatVersion = '1.3.0'
40-
archLifecycleVersion = '2.3.1'
41-
archTestingVersion = '2.1.0'
37+
androidXAnnotations = '1.3.0'
38+
appCompatVersion = '1.4.0'
39+
archLifecycleVersion = '2.4.0'
40+
coroutinesVersion = '1.5.2'
4241
cardVersion = '1.0.0'
43-
coroutinesVersion = '1.5.0'
44-
dexMakerVersion = '2.12.1'
45-
espressoVersion = '3.3.0'
46-
fragmentVersion = '1.3.4'
47-
fragmentKtxVersion = '1.3.4'
48-
hamcrestVersion = '1.3'
49-
junitVersion = '4.13.1'
50-
materialVersion = '1.3.0'
51-
multiDexVersion = '2.0.1'
52-
recyclerViewVersion = '1.2.0'
53-
robolectricVersion = '4.5.1'
42+
espressoVersion = '3.4.0'
43+
fragmentKtxVersion = '1.4.0'
44+
junitVersion = '4.13.2'
45+
materialVersion = '1.4.0'
46+
recyclerViewVersion = '1.2.1'
5447
roomVersion = '2.3.0'
5548
rulesVersion = '1.0.1'
49+
swipeRefreshLayoutVersion = '1.1.0'
5650
timberVersion = '4.7.1'
57-
truthVersion = '1.1.2'
5851
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Jun 14 12:47:31 UTC 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)