From e384aed5277f345db1af1aab845a7a4a855c83f0 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 21 Jan 2018 18:49:43 +0100 Subject: [PATCH] New project structure --- app/src/main/AndroidManifest.xml | 6 +++--- .../client/{ => ui/activities}/LoginActivity.java | 3 ++- .../client/{ => ui/activities}/MainActivity.java | 15 ++++++++------- .../{ => ui/activities}/SearchUserActivity.java | 5 +++-- .../adapters}/ConversationMessageAdapter.java | 3 ++- .../adapters}/ConversationsListAdapter.java | 3 ++- .../adapters}/FriendsAdapter.java | 5 +++-- .../adapters}/UsersAsysncInfoAdapter.java | 3 ++- .../adapters}/UsersBasicAdapter.java | 3 ++- .../{ => ui}/fragments/ConversationFragment.java | 7 +++---- .../fragments/ConversationsListFragment.java | 6 +++--- .../{ => ui}/fragments/FriendsListFragment.java | 6 +++--- .../fragments/UpdateConversationFragment.java | 8 ++++---- .../{ => ui}/fragments/UserInfosFragment.java | 4 ++-- .../{ => ui}/fragments/UserPageFragment.java | 4 ++-- app/src/main/res/layout/activity_login.xml | 2 +- 16 files changed, 45 insertions(+), 38 deletions(-) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui/activities}/LoginActivity.java (98%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui/activities}/MainActivity.java (95%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui/activities}/SearchUserActivity.java (95%) rename app/src/main/java/org/communiquons/android/comunic/client/{data/conversations => ui/adapters}/ConversationMessageAdapter.java (97%) rename app/src/main/java/org/communiquons/android/comunic/client/{data/conversations => ui/adapters}/ConversationsListAdapter.java (95%) rename app/src/main/java/org/communiquons/android/comunic/client/{data/friendsList => ui/adapters}/FriendsAdapter.java (95%) rename app/src/main/java/org/communiquons/android/comunic/client/{data/UsersInfo => ui/adapters}/UsersAsysncInfoAdapter.java (95%) rename app/src/main/java/org/communiquons/android/comunic/client/{data/UsersInfo => ui/adapters}/UsersBasicAdapter.java (94%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui}/fragments/ConversationFragment.java (98%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui}/fragments/ConversationsListFragment.java (98%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui}/fragments/FriendsListFragment.java (98%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui}/fragments/UpdateConversationFragment.java (98%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui}/fragments/UserInfosFragment.java (95%) rename app/src/main/java/org/communiquons/android/comunic/client/{ => ui}/fragments/UserPageFragment.java (98%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a48e3f5..83c7560 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:theme="@style/AppTheme"> - + @@ -26,12 +26,12 @@ diff --git a/app/src/main/java/org/communiquons/android/comunic/client/LoginActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/LoginActivity.java similarity index 98% rename from app/src/main/java/org/communiquons/android/comunic/client/LoginActivity.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/activities/LoginActivity.java index b034e83..60e9d47 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/LoginActivity.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/LoginActivity.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client; +package org.communiquons.android.comunic.client.ui.activities; import android.content.Intent; import android.support.v7.app.AppCompatActivity; @@ -10,6 +10,7 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; +import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.Account.Account; import org.communiquons.android.comunic.client.data.Account.AccountUtils; import org.communiquons.android.comunic.client.data.utils.Utilities; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java similarity index 95% rename from app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java index 1c236a7..06176e6 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/MainActivity.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client; +package org.communiquons.android.comunic.client.ui.activities; import android.app.AlertDialog; import android.app.FragmentTransaction; @@ -15,6 +15,7 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; +import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.api.APIRequest; import org.communiquons.android.comunic.client.data.Account.Account; import org.communiquons.android.comunic.client.data.Account.AccountUtils; @@ -23,12 +24,12 @@ import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper; import org.communiquons.android.comunic.client.data.friendsList.FriendRefreshLoopRunnable; import org.communiquons.android.comunic.client.data.utils.UiUtils; -import org.communiquons.android.comunic.client.fragments.ConversationFragment; -import org.communiquons.android.comunic.client.fragments.ConversationsListFragment; -import org.communiquons.android.comunic.client.fragments.FriendsListFragment; -import org.communiquons.android.comunic.client.fragments.UpdateConversationFragment; -import org.communiquons.android.comunic.client.fragments.UserInfosFragment; -import org.communiquons.android.comunic.client.fragments.UserPageFragment; +import org.communiquons.android.comunic.client.ui.fragments.ConversationFragment; +import org.communiquons.android.comunic.client.ui.fragments.ConversationsListFragment; +import org.communiquons.android.comunic.client.ui.fragments.FriendsListFragment; +import org.communiquons.android.comunic.client.ui.fragments.UpdateConversationFragment; +import org.communiquons.android.comunic.client.ui.fragments.UserInfosFragment; +import org.communiquons.android.comunic.client.ui.fragments.UserPageFragment; /** diff --git a/app/src/main/java/org/communiquons/android/comunic/client/SearchUserActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/SearchUserActivity.java similarity index 95% rename from app/src/main/java/org/communiquons/android/comunic/client/SearchUserActivity.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/activities/SearchUserActivity.java index 3307201..90fe68b 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/SearchUserActivity.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/SearchUserActivity.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client; +package org.communiquons.android.comunic.client.ui.activities; import android.content.Intent; import android.net.Uri; @@ -15,9 +15,10 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.Toast; +import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.DatabaseHelper; import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper; -import org.communiquons.android.comunic.client.data.UsersInfo.UsersBasicAdapter; +import org.communiquons.android.comunic.client.ui.adapters.UsersBasicAdapter; import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; import java.util.ArrayList; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessageAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java similarity index 97% rename from app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessageAdapter.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java index e3f5a38..f3df621 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationMessageAdapter.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationMessageAdapter.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.data.conversations; +package org.communiquons.android.comunic.client.ui.adapters; import android.content.Context; import android.support.annotation.NonNull; @@ -17,6 +17,7 @@ import android.widget.TextView; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager; import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; +import org.communiquons.android.comunic.client.data.conversations.ConversationMessage; import org.communiquons.android.comunic.client.data.utils.UiUtils; import java.util.ArrayList; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationsListAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationsListAdapter.java similarity index 95% rename from app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationsListAdapter.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationsListAdapter.java index 4b70e35..29610c8 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/data/conversations/ConversationsListAdapter.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/ConversationsListAdapter.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.data.conversations; +package org.communiquons.android.comunic.client.ui.adapters; import android.content.Context; import android.os.Build; @@ -11,6 +11,7 @@ import android.widget.ArrayAdapter; import android.widget.TextView; import org.communiquons.android.comunic.client.R; +import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo; import org.communiquons.android.comunic.client.data.utils.Utilities; import java.util.ArrayList; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/FriendsAdapter.java similarity index 95% rename from app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsAdapter.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/FriendsAdapter.java index 27f3b02..7792314 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/data/friendsList/FriendsAdapter.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/FriendsAdapter.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.data.friendsList; +package org.communiquons.android.comunic.client.ui.adapters; import android.app.Activity; import android.support.annotation.NonNull; @@ -13,8 +13,9 @@ import android.widget.TextView; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager; +import org.communiquons.android.comunic.client.data.friendsList.FriendUser; import org.communiquons.android.comunic.client.data.utils.Utilities; -import org.communiquons.android.comunic.client.fragments.FriendsListFragment; +import org.communiquons.android.comunic.client.ui.fragments.FriendsListFragment; import java.util.ArrayList; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersAsysncInfoAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersAsysncInfoAdapter.java similarity index 95% rename from app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersAsysncInfoAdapter.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersAsysncInfoAdapter.java index 76f7fc8..25dfd5c 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersAsysncInfoAdapter.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersAsysncInfoAdapter.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.data.UsersInfo; +package org.communiquons.android.comunic.client.ui.adapters; import android.content.Context; import android.support.annotation.NonNull; @@ -14,6 +14,7 @@ import android.widget.TextView; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager; +import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; import org.communiquons.android.comunic.client.data.utils.UiUtils; import java.util.ArrayList; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersBasicAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersBasicAdapter.java similarity index 94% rename from app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersBasicAdapter.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersBasicAdapter.java index 1fd3766..7f1bc0c 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/UsersBasicAdapter.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/UsersBasicAdapter.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.data.UsersInfo; +package org.communiquons.android.comunic.client.ui.adapters; import android.content.Context; import android.support.annotation.NonNull; @@ -12,6 +12,7 @@ import android.widget.TextView; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.ImageLoad.ImageLoadManager; +import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; import org.communiquons.android.comunic.client.data.utils.UiUtils; import java.util.ArrayList; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/ConversationFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java similarity index 98% rename from app/src/main/java/org/communiquons/android/comunic/client/fragments/ConversationFragment.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java index 1404947..82e66c4 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/ConversationFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationFragment.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.fragments; +package org.communiquons.android.comunic.client.ui.fragments; import android.app.AlertDialog; import android.app.Fragment; @@ -22,20 +22,19 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import org.communiquons.android.comunic.client.MainActivity; +import org.communiquons.android.comunic.client.ui.activities.MainActivity; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.Account.AccountUtils; import org.communiquons.android.comunic.client.data.DatabaseHelper; import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper; import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; import org.communiquons.android.comunic.client.data.conversations.ConversationMessage; -import org.communiquons.android.comunic.client.data.conversations.ConversationMessageAdapter; +import org.communiquons.android.comunic.client.ui.adapters.ConversationMessageAdapter; import org.communiquons.android.comunic.client.data.conversations.ConversationMessagesHelper; import org.communiquons.android.comunic.client.data.conversations.ConversationRefreshRunnable; import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper; import org.communiquons.android.comunic.client.data.utils.BitmapUtils; -import org.w3c.dom.Text; import java.io.FileNotFoundException; import java.io.InputStream; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/ConversationsListFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java similarity index 98% rename from app/src/main/java/org/communiquons/android/comunic/client/fragments/ConversationsListFragment.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java index f57b0d2..4f50067 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/ConversationsListFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/ConversationsListFragment.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.fragments; +package org.communiquons.android.comunic.client.ui.fragments; import android.app.AlertDialog; import android.app.Fragment; @@ -19,14 +19,14 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.Toast; -import org.communiquons.android.comunic.client.MainActivity; +import org.communiquons.android.comunic.client.ui.activities.MainActivity; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.Account.AccountUtils; import org.communiquons.android.comunic.client.data.DatabaseHelper; import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper; import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo; -import org.communiquons.android.comunic.client.data.conversations.ConversationsListAdapter; +import org.communiquons.android.comunic.client.ui.adapters.ConversationsListAdapter; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper.openConversationListener; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper.updateConversationListener; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java similarity index 98% rename from app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java index 068a745..583abda 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/FriendsListFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/FriendsListFragment.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.fragments; +package org.communiquons.android.comunic.client.ui.fragments; import android.app.AlertDialog; import android.app.Fragment; @@ -18,7 +18,7 @@ import android.widget.AdapterView; import android.widget.ListView; import android.widget.Toast; -import org.communiquons.android.comunic.client.MainActivity; +import org.communiquons.android.comunic.client.ui.activities.MainActivity; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.DatabaseHelper; import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper; @@ -26,7 +26,7 @@ import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper; import org.communiquons.android.comunic.client.data.friendsList.Friend; import org.communiquons.android.comunic.client.data.friendsList.FriendUser; -import org.communiquons.android.comunic.client.data.friendsList.FriendsAdapter; +import org.communiquons.android.comunic.client.ui.adapters.FriendsAdapter; import org.communiquons.android.comunic.client.data.friendsList.FriendsListHelper; import org.communiquons.android.comunic.client.data.friendsList.FriendsUtils; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UpdateConversationFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java similarity index 98% rename from app/src/main/java/org/communiquons/android/comunic/client/fragments/UpdateConversationFragment.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java index 5002119..98415e2 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UpdateConversationFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UpdateConversationFragment.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.fragments; +package org.communiquons.android.comunic.client.ui.fragments; import android.app.Activity; import android.app.Fragment; @@ -21,14 +21,14 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import org.communiquons.android.comunic.client.MainActivity; +import org.communiquons.android.comunic.client.ui.activities.MainActivity; import org.communiquons.android.comunic.client.R; -import org.communiquons.android.comunic.client.SearchUserActivity; +import org.communiquons.android.comunic.client.ui.activities.SearchUserActivity; import org.communiquons.android.comunic.client.data.Account.AccountUtils; import org.communiquons.android.comunic.client.data.DatabaseHelper; import org.communiquons.android.comunic.client.data.UsersInfo.GetUsersHelper; import org.communiquons.android.comunic.client.data.UsersInfo.UserInfo; -import org.communiquons.android.comunic.client.data.UsersInfo.UsersAsysncInfoAdapter; +import org.communiquons.android.comunic.client.ui.adapters.UsersAsysncInfoAdapter; import org.communiquons.android.comunic.client.data.conversations.ConversationsInfo; import org.communiquons.android.comunic.client.data.conversations.ConversationsListHelper; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserInfosFragment.java similarity index 95% rename from app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserInfosFragment.java index 0bee1fa..a545b72 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserInfosFragment.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.fragments; +package org.communiquons.android.comunic.client.ui.fragments; import android.app.Fragment; @@ -12,7 +12,7 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import org.communiquons.android.comunic.client.MainActivity; +import org.communiquons.android.comunic.client.ui.activities.MainActivity; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.Account.AccountUtils; import org.communiquons.android.comunic.client.data.DatabaseHelper; diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserPageFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java similarity index 98% rename from app/src/main/java/org/communiquons/android/comunic/client/fragments/UserPageFragment.java rename to app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java index 5eac685..619fafc 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserPageFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/UserPageFragment.java @@ -1,4 +1,4 @@ -package org.communiquons.android.comunic.client.fragments; +package org.communiquons.android.comunic.client.ui.fragments; import android.app.AlertDialog; import android.app.Fragment; @@ -14,7 +14,7 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import org.communiquons.android.comunic.client.MainActivity; +import org.communiquons.android.comunic.client.ui.activities.MainActivity; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.Account.AccountUtils; import org.communiquons.android.comunic.client.data.DatabaseHelper; diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 6f1867a..4a604d8 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -9,7 +9,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:orientation="vertical" - tools:context="org.communiquons.android.comunic.client.LoginActivity"> + tools:context="org.communiquons.android.comunic.client.ui.activities.LoginActivity">