Skip to content

Commit 17cf8f1

Browse files
author
Mark TBL
committed
🔨 Fixed Some minor Issues
1 parent c9d9418 commit 17cf8f1

File tree

9 files changed

+41
-12
lines changed

9 files changed

+41
-12
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.coxtunes.androidarchitecturekotlin2021">
44

5+
<uses-permission android:name="android.permission.INTERNET"/>
6+
57
<application
8+
android:name=".common.app.BaseApplication"
69
android:allowBackup="true"
710
android:icon="@mipmap/ic_launcher"
811
android:label="@string/app_name"
912
android:roundIcon="@mipmap/ic_launcher_round"
1013
android:supportsRtl="true"
1114
android:theme="@style/Theme.AndroidArchitectureKotlin2021">
1215
<activity
13-
android:name=".MainActivity"
16+
android:name=".ui.views.activity.MainActivity"
1417
android:exported="true">
1518
<intent-filter>
1619
<action android:name="android.intent.action.MAIN" />
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.coxtunes.androidarchitecturekotlin2021.data.mapper
22

3-
import com.coxtunes.androidarchitecture2021.data.dto.user.UsersItem
3+
4+
import com.coxtunes.androidarchitecturekotlin2021.data.dto.user.UsersItem
45
import com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects.UsersViewItems
56

67
/**
@@ -9,5 +10,5 @@ import com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects.UsersViewIt
910
*/
1011

1112
fun UsersItem.toUsers(): UsersViewItems {
12-
return UsersViewItems(name, phone, website)
13+
return UsersViewItems(name, email, phone, website)
1314
}

app/src/main/java/com/coxtunes/androidarchitecturekotlin2021/data/remoteDataSource/UsersRemoteDataSource.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.coxtunes.androidarchitecturekotlin2021.data.remoteDataSource
22

3-
import com.coxtunes.androidarchitecture2021.common.responseSealed.Resource
3+
import com.coxtunes.androidarchitecturekotlin2021.common.responseSealed.Resource
44
import com.coxtunes.androidarchitecturekotlin2021.data.api.UsersApi
5+
import com.coxtunes.androidarchitecturekotlin2021.data.mapper.toUsers
56
import com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects.UsersViewItems
67
import javax.inject.Inject
78

app/src/main/java/com/coxtunes/androidarchitecturekotlin2021/data/repository/DefaultUserRepository.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.coxtunes.androidarchitecturekotlin2021.data.repository
2-
3-
import com.coxtunes.androidarchitecture2021.common.responseSealed.Resource
4-
import com.coxtunes.androidarchitecture2021.common.utility.DispatcherProvider
2+
import com.coxtunes.androidarchitecturekotlin2021.common.responseSealed.Resource
3+
import com.coxtunes.androidarchitecturekotlin2021.common.utility.DispatcherProvider
54
import com.coxtunes.androidarchitecturekotlin2021.data.remoteDataSource.UsersRemoteDataSource
65
import com.coxtunes.androidarchitecturekotlin2021.domain.repository.UserRepository
76
import com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects.UsersViewItems

app/src/main/java/com/coxtunes/androidarchitecturekotlin2021/domain/usecase/GetUsersUseCase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.coxtunes.androidarchitecturekotlin2021.domain.usecase
22

3-
import com.coxtunes.androidarchitecture2021.common.responseSealed.Resource
3+
import com.coxtunes.androidarchitecturekotlin2021.common.responseSealed.Resource
44
import com.coxtunes.androidarchitecturekotlin2021.domain.repository.UserRepository
55
import com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects.UsersViewItems
66
import javax.inject.Inject

app/src/main/java/com/coxtunes/androidarchitecturekotlin2021/domain/viewobjects/UsersViewItems.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects
66
*/
77
data class UsersViewItems(
88
val name: String,
9+
val email: String,
910
val phone: String,
1011
val website: String
1112
)

app/src/main/java/com/coxtunes/androidarchitecturekotlin2021/ui/viewmodel/UserViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.coxtunes.androidarchitecturekotlin2021.ui.viewmodel
22

33
import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.viewModelScope
5-
import com.coxtunes.androidarchitecture2021.common.responseSealed.Resource
5+
import com.coxtunes.androidarchitecturekotlin2021.common.responseSealed.Resource
66
import com.coxtunes.androidarchitecturekotlin2021.domain.usecase.GetUsersUseCase
77
import com.coxtunes.androidarchitecturekotlin2021.domain.viewobjects.UsersViewItems
88
import com.coxtunes.androidarchitecturekotlin2021.ui.uistate.UsersUiState

app/src/main/res/layout/item_user.xml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,39 @@
1616
android:layout_marginVertical="4dp">
1717

1818
<TextView
19+
android:id="@+id/textView"
1920
android:layout_width="wrap_content"
2021
android:layout_height="wrap_content"
22+
android:layout_marginStart="15dp"
23+
android:layout_marginTop="10dp"
2124
android:text="@{user.name}"
22-
app:layout_constraintBottom_toBottomOf="parent"
25+
android:textColor="#673AB7"
26+
android:textSize="20sp"
27+
android:textStyle="bold"
2328
app:layout_constraintStart_toStartOf="parent"
2429
app:layout_constraintTop_toTopOf="parent"
25-
tools:text="A binding class is generated for each layout file. By default, the name of the class is based on the name of the layout file, converting it to Pascal case and adding the Binding suffix to it. " />
30+
tools:text="Nayeem Shiddiki Abir" />
2631

32+
<TextView
33+
android:id="@+id/textView2"
34+
android:layout_width="wrap_content"
35+
android:layout_height="wrap_content"
36+
android:layout_marginTop="3dp"
37+
android:text="@{user.email}"
38+
android:textColor="@color/black"
39+
app:layout_constraintStart_toStartOf="@+id/textView"
40+
app:layout_constraintTop_toBottomOf="@+id/textView"
41+
tools:text="Email: [email protected]" />
2742

43+
<TextView
44+
android:layout_width="wrap_content"
45+
android:layout_height="wrap_content"
46+
android:layout_marginBottom="10dp"
47+
android:text="@{user.phone}"
48+
app:layout_constraintBottom_toBottomOf="parent"
49+
app:layout_constraintStart_toStartOf="@+id/textView2"
50+
app:layout_constraintTop_toBottomOf="@+id/textView2"
51+
tools:text="Phone: +012542555222" />
2852

2953

3054
</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">AndroidArchitectureKotlin2021</string>
2+
<string name="app_name">AndroidArchitectureKotlin2022</string>
33
</resources>

0 commit comments

Comments
 (0)