ReiMerc/easyeat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Group activities and fragments by domain

Browse Source
This commit is contained in:
Reimar 2025-05-06 08:50:09 +02:00
parent 0c1f167e20
commit bdd7a0dfdb
Signed by: Reimar
GPG Key ID: 93549FA07F0AE268
12 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/app/src/main/AndroidManifest.xml
View File

@ -25,31 +25,31 @@
</activity>
<activity
android:name=".MainActivity"
android:name=".ui.MainActivity"
android:exported="false" />
<activity
android:name=".WelcomeActivity"
android:name=".ui.auth.WelcomeActivity"
android:exported="false" />
<activity
android:name=".LoginActivity"
android:name=".ui.auth.LoginActivity"
android:exported="false" />
<activity
android:name=".RegisterActivity"
android:name=".ui.auth.RegisterActivity"
android:exported="false" />
<activity
android:name=".CreateDishActivity"
android:name=".ui.dishes.CreateDishActivity"
android:exported="false" />
<activity
android:name=".ChangePasswordActivity"
android:name=".ui.profile.ChangePasswordActivity"
android:exported="false" />
<activity
android:name=".EditProfileActivity"
android:name=".ui.profile.EditProfileActivity"
android:exported="false" />
</application>

4
app/app/src/main/java/tech/mercantec/easyeat/SplashActivity.kt
View File

@ -4,6 +4,8 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import tech.mercantec.easyeat.helpers.isLoggedIn
import tech.mercantec.easyeat.ui.MainActivity
import tech.mercantec.easyeat.ui.auth.WelcomeActivity
class SplashActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
@ -17,4 +19,4 @@ class SplashActivity : Activity() {
startActivity(Intent(this, MainActivity::class.java))
}
}
}

3
app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
View File

@ -3,7 +3,6 @@ package tech.mercantec.easyeat.helpers
import android.content.Context
import android.content.Intent
import android.util.Log
import android.widget.Toast
import kotlinx.serialization.Serializable
import kotlinx.serialization.SerializationException
import tech.mercantec.easyeat.BuildConfig
@ -11,7 +10,7 @@ import java.net.HttpURLConnection
import java.net.URL
import kotlinx.serialization.json.*
import kotlinx.serialization.serializer
import tech.mercantec.easyeat.LoginActivity
import tech.mercantec.easyeat.ui.auth.LoginActivity
import java.io.IOException
class ApiRequestException(message: String, cause: Throwable?) : Exception(message, cause)

17
app/app/src/main/java/tech/mercantec/easyeat/MainActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/MainActivity.kt
View File

@ -1,9 +1,7 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui
import android.content.Intent
import android.os.Bundle
import android.widget.ListView
import android.widget.Toast
import com.google.android.material.bottomnavigation.BottomNavigationView
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.findNavController
@ -12,10 +10,7 @@ import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.floatingactionbutton.FloatingActionButton
import tech.mercantec.easyeat.databinding.ActivityMainBinding
import tech.mercantec.easyeat.helpers.getUserInfo
import tech.mercantec.easyeat.models.Dish
import tech.mercantec.easyeat.ui.dishes.DishAdapter
import kotlin.concurrent.thread
import tech.mercantec.easyeat.ui.dishes.CreateDishActivity
class MainActivity : AppCompatActivity() {
@ -29,16 +24,18 @@ class MainActivity : AppCompatActivity() {
val navView: BottomNavigationView = binding.navView
val navController = findNavController(R.id.nav_host_fragment_activity_main)
val navController = findNavController(tech.mercantec.easyeat.R.id.nav_host_fragment_activity_main)
val appBarConfiguration = AppBarConfiguration(
setOf(
R.id.navigation_dishes, R.id.navigation_shopping_list, R.id.navigation_profile
tech.mercantec.easyeat.R.id.navigation_dishes,
tech.mercantec.easyeat.R.id.navigation_shopping_list,
tech.mercantec.easyeat.R.id.navigation_profile
)
)
setupActionBarWithNavController(navController, appBarConfiguration)
navView.setupWithNavController(navController)
findViewById<FloatingActionButton>(R.id.add_dish).setOnClickListener {
findViewById<FloatingActionButton>(tech.mercantec.easyeat.R.id.add_dish).setOnClickListener {
val intent = Intent(this, CreateDishActivity::class.java)
startActivity(intent)
}

4
app/app/src/main/java/tech/mercantec/easyeat/LoginActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/auth/LoginActivity.kt
View File

@ -1,4 +1,4 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui.auth
import android.app.ProgressDialog
import android.content.Intent
@ -7,6 +7,8 @@ import android.widget.Button
import android.widget.EditText
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import tech.mercantec.easyeat.ui.MainActivity
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.login
import kotlin.concurrent.thread

3
app/app/src/main/java/tech/mercantec/easyeat/RegisterActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/auth/RegisterActivity.kt
View File

@ -1,4 +1,4 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui.auth
import android.app.ProgressDialog
import android.content.Intent
@ -7,6 +7,7 @@ import android.widget.Button
import android.widget.EditText
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.register
import kotlin.concurrent.thread

6
app/app/src/main/java/tech/mercantec/easyeat/WelcomeActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/auth/WelcomeActivity.kt
View File

@ -1,12 +1,10 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui.auth
import android.content.Intent
import android.os.Bundle
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import tech.mercantec.easyeat.R
class WelcomeActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

4
app/app/src/main/java/tech/mercantec/easyeat/CreateDishActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
View File

@ -1,4 +1,4 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui.dishes
import android.os.Bundle
import android.util.Log
@ -10,7 +10,7 @@ import android.widget.ImageButton
import android.widget.LinearLayout
import android.widget.Spinner
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContentProviderCompat.requireContext
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.models.Ingredient
class CreateDishActivity : AppCompatActivity() {

1
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
View File

@ -7,7 +7,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.fragment.app.Fragment
import tech.mercantec.easyeat.CreateDishActivity
import tech.mercantec.easyeat.databinding.FragmentDishesBinding
import tech.mercantec.easyeat.models.Dish

6
app/app/src/main/java/tech/mercantec/easyeat/ChangePasswordActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/profile/ChangePasswordActivity.kt
View File

@ -1,14 +1,12 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui.profile
import android.app.ProgressDialog
import android.os.Bundle
import android.widget.Button
import android.widget.EditText
import android.widget.Toast
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.changePassword
import kotlin.concurrent.thread

3
app/app/src/main/java/tech/mercantec/easyeat/EditProfileActivity.kt → app/app/src/main/java/tech/mercantec/easyeat/ui/profile/EditProfileActivity.kt
View File

@ -1,4 +1,4 @@
package tech.mercantec.easyeat
package tech.mercantec.easyeat.ui.profile
import android.app.ProgressDialog
import android.os.Bundle
@ -7,6 +7,7 @@ import android.widget.EditText
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.updateUser
import kotlin.concurrent.thread

5
app/app/src/main/java/tech/mercantec/easyeat/ui/profile/ProfileFragment.kt
View File

@ -7,10 +7,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.fragment.app.Fragment
import tech.mercantec.easyeat.ChangePasswordActivity
import tech.mercantec.easyeat.EditProfileActivity
import tech.mercantec.easyeat.LoginActivity
import tech.mercantec.easyeat.WelcomeActivity
import tech.mercantec.easyeat.ui.auth.WelcomeActivity
import tech.mercantec.easyeat.databinding.FragmentProfileBinding
import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.UserInfoResponse