Skip to content

Commit a22c0a5

Browse files
OrlandroidOrlandroid
committed
Update Base
1 parent 1e9ba54 commit a22c0a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+116
-149
lines changed

‎app/src/main/java/com/example/androidbase/presentation/base/BaseActivity.kt

-29
This file was deleted.

‎app/src/main/java/com/example/androidbase/presentation/ui/MainActivity.kt

-59
This file was deleted.

‎app/src/main/java/com/example/androidbase/presentation/ui/userDetail/UserDetailFragment.kt

-16
This file was deleted.

‎app/.gitignore ‎presentation/.gitignore

File renamed without changes.

‎app/build.gradle.kts ‎presentation/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
}
1313

1414
android {
15-
namespace = "com.example.androidbase"
15+
namespace = "com.example.presentation"
1616
compileSdk = ConfigData.COMPILE_SDK_VERSION
1717

1818
defaultConfig {

‎app/proguard-rules.pro ‎presentation/proguard-rules.pro

File renamed without changes.

‎app/src/androidTest/java/com/example/androidbase/ExampleInstrumentedTest.kt ‎presentation/src/androidTest/java/com/example/androidbase/ExampleInstrumentedTest.kt

File renamed without changes.

‎app/src/main/AndroidManifest.xml ‎presentation/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
99

1010
<application
11-
android:name=".presentation.Application"
11+
android:name=".Application"
1212
android:allowBackup="true"
1313
android:dataExtractionRules="@xml/data_extraction_rules"
1414
android:fullBackupContent="@xml/backup_rules"
@@ -19,7 +19,7 @@
1919
android:theme="@style/Theme.AndroidBase"
2020
tools:targetApi="31">
2121
<activity
22-
android:name=".presentation.ui.MainActivity"
22+
android:name=".ui.MainActivity"
2323
android:exported="true">
2424
<intent-filter>
2525
<action android:name="android.intent.action.MAIN" />

‎app/src/main/java/com/example/androidbase/presentation/Application.kt ‎presentation/src/main/java/com/example/presentation/Application.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation
1+
package com.example.presentation
22

33
import android.app.Application
44
import dagger.hilt.android.HiltAndroidApp

‎app/src/main/java/com/example/androidbase/presentation/alerts/MainAlert.kt ‎presentation/src/main/java/com/example/presentation/alerts/MainAlert.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.example.androidbase.presentation.alerts
1+
package com.example.presentation.alerts
22

33
import android.app.Dialog
44
import android.os.Bundle
55
import android.view.*
66
import androidx.fragment.app.DialogFragment
7-
import com.example.androidbase.R
8-
import com.example.androidbase.databinding.AlertDialogMessagesBinding
7+
import com.example.presentation.R
8+
import com.example.presentation.databinding.AlertDialogMessagesBinding
99

1010

1111
class MainAlert(

‎app/src/main/java/com/example/androidbase/presentation/base/BaseFragment.kt ‎presentation/src/main/java/com/example/presentation/base/BaseFragment.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
package com.example.androidbase.presentation.base
1+
package com.example.presentation.base
22

33

44
import android.os.Bundle
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8-
import android.widget.Button
98
import androidx.annotation.LayoutRes
109
import androidx.databinding.DataBindingUtil
1110
import androidx.databinding.ViewDataBinding
1211
import androidx.fragment.app.Fragment
1312
import androidx.navigation.fragment.findNavController
14-
import com.example.androidbase.presentation.extensions.hideProgress
15-
import com.example.androidbase.presentation.ui.MainActivity
13+
import com.example.presentation.extensions.hideProgress
14+
import com.example.presentation.ui.MainActivity
1615

1716
abstract class BaseFragment<ViewBinding : ViewDataBinding>(@LayoutRes protected val contentLayoutId: Int) :
1817
Fragment() {

‎app/src/main/java/com/example/androidbase/presentation/base/BaseViewModel.kt ‎presentation/src/main/java/com/example/presentation/base/BaseViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.example.androidbase.presentation.base
1+
package com.example.presentation.base
22

33
import android.util.Log
44
import androidx.lifecycle.MutableLiveData
55
import androidx.lifecycle.ViewModel
66
import androidx.lifecycle.viewModelScope
7-
import com.example.androidbase.presentation.helpers.NetworkHelper
7+
import com.example.presentation.helpers.NetworkHelper
88
import kotlinx.coroutines.launch
99
import kotlinx.coroutines.withContext
1010
import okio.IOException

‎app/src/main/java/com/example/androidbase/presentation/extensions/Base64.kt ‎presentation/src/main/java/com/example/presentation/extensions/Base64.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation.extensions
1+
package com.example.presentation.extensions
22

33
import android.graphics.Bitmap
44
import android.graphics.BitmapFactory

‎app/src/main/java/com/example/androidbase/presentation/extensions/Extensions.kt ‎presentation/src/main/java/com/example/presentation/extensions/Extensions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation.extensions
1+
package com.example.presentation.extensions
22

33
import android.app.Activity
44
import android.content.Context

‎app/src/main/java/com/example/androidbase/presentation/extensions/Fragments.kt ‎presentation/src/main/java/com/example/presentation/extensions/Fragments.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.example.androidbase.presentation.extensions
1+
package com.example.presentation.extensions
22

33
import androidx.fragment.app.Fragment
44
import androidx.lifecycle.LiveData
55
import androidx.navigation.NavDirections
66
import androidx.navigation.fragment.findNavController
7-
import com.example.androidbase.R
7+
import com.example.presentation.ui.MainActivity
88
import com.example.domain.state.Result
9-
import com.example.androidbase.presentation.alerts.MainAlert
10-
import com.example.androidbase.presentation.alerts.MainAlert.Companion.ERROR_MESSAGE
11-
import com.example.androidbase.presentation.ui.MainActivity
9+
import com.example.presentation.R
10+
import com.example.presentation.alerts.MainAlert
11+
import com.example.presentation.alerts.MainAlert.Companion.ERROR_MESSAGE
1212

1313

1414
fun Fragment.showProgress() {

‎app/src/main/java/com/example/androidbase/presentation/extensions/LiveData.kt ‎presentation/src/main/java/com/example/presentation/extensions/LiveData.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation.extensions
1+
package com.example.presentation.extensions
22

33
import androidx.lifecycle.LifecycleOwner
44
import androidx.lifecycle.LiveData

‎app/src/main/java/com/example/androidbase/presentation/extensions/Views.kt ‎presentation/src/main/java/com/example/presentation/extensions/Views.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation.extensions
1+
package com.example.presentation.extensions
22

33
import android.graphics.Bitmap
44
import android.graphics.Canvas

‎app/src/main/java/com/example/androidbase/presentation/extensions/anonymousObjects.kt ‎presentation/src/main/java/com/example/presentation/extensions/anonymousObjects.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation.extensions
1+
package com.example.presentation.extensions
22

33
import android.text.Editable
44
import android.text.TextWatcher

‎app/src/main/java/com/example/androidbase/presentation/helpers/NetworkHelper.kt ‎presentation/src/main/java/com/example/presentation/helpers/NetworkHelper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.androidbase.presentation.helpers
1+
package com.example.presentation.helpers
22

33
import android.content.Context
44
import android.net.ConnectivityManager

‎presentation/src/main/java/com/example/presentation/ui/MainActivity.kt

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package com.example.presentation.ui
2+
3+
import android.os.Bundle
4+
import androidx.appcompat.app.AppCompatActivity
5+
import androidx.core.view.isVisible
6+
import com.example.presentation.extensions.click
7+
import com.example.presentation.extensions.gone
8+
import com.example.presentation.extensions.visible
9+
import com.example.presentation.databinding.ActivityMainBinding
10+
import dagger.hilt.android.AndroidEntryPoint
11+
12+
13+
@AndroidEntryPoint
14+
class MainActivity : AppCompatActivity() {
15+
16+
private lateinit var binding: ActivityMainBinding
17+
18+
override fun onCreate(savedInstanceState: Bundle?) {
19+
super.onCreate(savedInstanceState)
20+
binding = ActivityMainBinding.inflate(layoutInflater)
21+
setContentView(binding.root)
22+
}
23+
24+
fun changeTitleToolbar(title: String) {
25+
binding.toolbarLayout.toolbarTitle.text = title
26+
}
27+
28+
fun setOnBackClick(clickOnBack: () -> Unit) {
29+
binding.toolbarLayout.toolbarBack.click {
30+
clickOnBack()
31+
}
32+
}
33+
34+
fun showToolbar(shouldShow: Boolean) {
35+
if (shouldShow) {
36+
binding.toolbarLayout.root.visible()
37+
} else {
38+
binding.toolbarLayout.root.gone()
39+
}
40+
}
41+
42+
fun showProgress() {
43+
if (!binding.progressBar.isVisible) {
44+
binding.progressBar.visible()
45+
}
46+
}
47+
48+
fun hideProgress() {
49+
if (binding.progressBar.isVisible) {
50+
binding.progressBar.gone()
51+
}
52+
}
53+
54+
fun shouldShowProgress(isLoading: Boolean) {
55+
if (isLoading) {
56+
showProgress()
57+
} else {
58+
hideProgress()
59+
}
60+
}
61+
}

‎presentation/src/main/java/com/example/presentation/ui/userDetail/UserDetailFragment.kt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.example.presentation.ui.userDetail
2+
3+
import com.example.presentation.R
4+
import com.example.presentation.databinding.FragmentUserDetailBinding
5+
import com.example.presentation.base.BaseFragment
6+
import com.example.presentation.extensions.setonBackListener
7+
8+
9+
class UserDetailFragment : BaseFragment<FragmentUserDetailBinding>(R.layout.fragment_user_detail) {
10+
11+
override fun setUpUi() {
12+
setonBackListener { navController.popBackStack() }
13+
}
14+
15+
}

‎app/src/main/java/com/example/androidbase/presentation/ui/users/UserAdapter.kt ‎presentation/src/main/java/com/example/presentation/ui/users/UserAdapter.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.example.androidbase.presentation.ui.users
1+
package com.example.presentation.ui.users
22

33
import android.view.LayoutInflater
44
import android.view.ViewGroup
55
import androidx.recyclerview.widget.RecyclerView
66
import com.example.domain.entities.remote.User
7-
import com.example.androidbase.databinding.ItemUserBinding
8-
import com.example.androidbase.presentation.extensions.click
7+
import com.example.presentation.extensions.click
8+
import com.example.presentation.databinding.ItemUserBinding
99

1010

1111
class UserAdapter(private val clickOnUser: (User) -> Unit) :

‎app/src/main/java/com/example/androidbase/presentation/ui/users/UsersFragment.kt ‎presentation/src/main/java/com/example/presentation/ui/users/UsersFragment.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.example.androidbase.presentation.ui.users
1+
package com.example.presentation.ui.users
22

33
import androidx.fragment.app.viewModels
4-
import com.example.androidbase.R
5-
import com.example.androidbase.databinding.FragmentUsersBinding
6-
import com.example.androidbase.presentation.base.BaseFragment
7-
import com.example.androidbase.presentation.extensions.observeApiResult
8-
import com.example.androidbase.presentation.extensions.setonBackListener
4+
import com.example.presentation.R
5+
import com.example.presentation.databinding.FragmentUsersBinding
6+
import com.example.presentation.base.BaseFragment
7+
import com.example.presentation.extensions.observeApiResult
8+
import com.example.presentation.extensions.setonBackListener
99
import com.example.domain.entities.remote.User
1010
import dagger.hilt.android.AndroidEntryPoint
1111

@@ -38,7 +38,7 @@ class UsersFragment : BaseFragment<FragmentUsersBinding>(R.layout.fragment_users
3838
}
3939

4040
private fun clickOnUser(user: User) {
41-
navController.navigate(UsersFragmentDirections.actionUsersFragmentToUserDetailFragment())
41+
//navController.navigate(UsersFragmentDirections.actionUsersFragmentToUserDetailFragment())
4242
}
4343

4444
}

‎app/src/main/java/com/example/androidbase/presentation/ui/users/UsersViewModel.kt ‎presentation/src/main/java/com/example/presentation/ui/users/UsersViewModel.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.example.androidbase.presentation.ui.users
1+
package com.example.presentation.ui.users
22

33
import android.util.Log
44
import androidx.lifecycle.LiveData
55
import androidx.lifecycle.MutableLiveData
66
import androidx.lifecycle.viewModelScope
77
import com.example.data.Repository
8-
import com.example.androidbase.presentation.base.BaseViewModel
9-
import com.example.androidbase.presentation.helpers.NetworkHelper
8+
import com.example.presentation.base.BaseViewModel
9+
import com.example.presentation.helpers.NetworkHelper
1010
import dagger.hilt.android.lifecycle.HiltViewModel
1111
import kotlinx.coroutines.Dispatchers
1212
import kotlinx.coroutines.launch

‎app/src/main/res/drawable-v24/ic_launcher_foreground.xml ‎presentation/src/main/res/drawable-v24/ic_launcher_foreground.xml

File renamed without changes.

‎app/src/main/res/drawable/ic_arrow.xml ‎presentation/src/main/res/drawable/ic_arrow.xml

File renamed without changes.

‎app/src/main/res/drawable/ic_launcher_background.xml ‎presentation/src/main/res/drawable/ic_launcher_background.xml

File renamed without changes.

‎app/src/main/res/drawable/user.jpg ‎presentation/src/main/res/drawable/user.jpg

File renamed without changes.

‎app/src/main/res/layout/activity_main.xml ‎presentation/src/main/res/layout/activity_main.xml

File renamed without changes.

‎app/src/main/res/layout/alert_dialog_messages.xml ‎presentation/src/main/res/layout/alert_dialog_messages.xml

File renamed without changes.

‎app/src/main/res/layout/fragment_home.xml ‎presentation/src/main/res/layout/fragment_home.xml

File renamed without changes.

‎app/src/main/res/layout/fragment_user_detail.xml ‎presentation/src/main/res/layout/fragment_user_detail.xml

File renamed without changes.

‎app/src/main/res/layout/fragment_users.xml ‎presentation/src/main/res/layout/fragment_users.xml

File renamed without changes.

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

File renamed without changes.

‎app/src/main/res/layout/toolbar_view.xml ‎presentation/src/main/res/layout/toolbar_view.xml

File renamed without changes.

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml ‎presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

File renamed without changes.

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml ‎presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

File renamed without changes.

‎app/src/main/res/mipmap-hdpi/ic_launcher.webp ‎presentation/src/main/res/mipmap-hdpi/ic_launcher.webp

File renamed without changes.

‎app/src/main/res/mipmap-hdpi/ic_launcher_round.webp ‎presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp

File renamed without changes.

‎app/src/main/res/mipmap-mdpi/ic_launcher.webp ‎presentation/src/main/res/mipmap-mdpi/ic_launcher.webp

File renamed without changes.

‎app/src/main/res/mipmap-mdpi/ic_launcher_round.webp ‎presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp

File renamed without changes.

‎app/src/main/res/mipmap-xhdpi/ic_launcher.webp ‎presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp

File renamed without changes.

‎app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp ‎presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp

File renamed without changes.

‎app/src/main/res/mipmap-xxhdpi/ic_launcher.webp ‎presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp

File renamed without changes.

‎app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp ‎presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp

File renamed without changes.

‎app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp ‎presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

File renamed without changes.

‎app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp ‎presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

File renamed without changes.

0 commit comments

Comments
 (0)