From a967c8748efe8b043ac7125cce3f750d8a6a070f Mon Sep 17 00:00:00 2001 From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com> Date: Wed, 20 Mar 2019 01:53:48 +0100 Subject: [PATCH] =?UTF-8?q?Emulator=20funktioniert,=20aber=20am=20Handy=20?= =?UTF-8?q?sind=20einige=20kn=C3=B6pfe=20einfach=20weg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package wurde zu at.smartshopper.smartshopperapp umbenannt um es auf gooogle play hochladen zu können. Weil die erste version mit dem alten system hochgeladen war, und desswegen war der packagename besetzt. --- .idea/caches/gradle_models.ser | Bin 277282 -> 277288 bytes app/build.gradle | 2 +- app/google-services.json | 35 +++++++++++++++++- .../ExampleInstrumentedTest.java | 2 +- app/src/main/AndroidManifest.xml | 18 ++++----- .../activitys/Colorpicker.java | 4 +- .../activitys/Dash.java | 18 ++++----- .../activitys/DoneItemActivity.java | 14 +++---- .../activitys/EditUser.java | 9 ++--- .../activitys/ItemListActivity.java | 17 ++++----- .../activitys/LoginActivity.java | 8 ++-- .../activitys/ShoppinglistDetails.java | 24 ++++++------ .../RoundCornersTransformation.java | 2 +- .../customViews/SpaceItemDecoration.java | 2 +- .../customViews/ToolbarHelper.java | 12 +++--- .../db/Database.java | 12 +++--- .../db/SerializableDatabase.java | 2 +- .../messaging/MyFirebaseMessagingService.java | 6 +-- .../messaging/MyFirebaseSender.java | 4 +- .../shoppinglist/Member.java | 2 +- .../shoppinglist/Shoppinglist.java | 2 +- .../shoppinglist/ShoppinglistAdapter.java | 13 ++++--- .../ShoppinglistSharedAdapter.java | 18 +++++---- .../shoppinglist/details/Details.java | 6 +-- .../shoppinglist/details/DetailsAdapter.java | 14 +++---- .../shoppinglist/details/group/Group.java | 2 +- .../shoppinglist/details/item/Item.java | 2 +- .../details/item/ItemAdapter.java | 8 ++-- .../item/ItemShoppinglistDetailsAdapter.java | 10 ++--- .../ExampleUnitTest.java | 2 +- 30 files changed, 151 insertions(+), 119 deletions(-) rename app/src/androidTest/java/at/smartshopper/{smartshopper => smartshopperapp}/ExampleInstrumentedTest.java (94%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/Colorpicker.java (97%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/Dash.java (98%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/DoneItemActivity.java (91%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/EditUser.java (98%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/ItemListActivity.java (96%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/LoginActivity.java (98%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/activitys/ShoppinglistDetails.java (95%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/customViews/RoundCornersTransformation.java (99%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/customViews/SpaceItemDecoration.java (93%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/customViews/ToolbarHelper.java (93%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/db/Database.java (99%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/db/SerializableDatabase.java (91%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/messaging/MyFirebaseMessagingService.java (96%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/messaging/MyFirebaseSender.java (95%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/Member.java (91%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/Shoppinglist.java (95%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/ShoppinglistAdapter.java (95%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/ShoppinglistSharedAdapter.java (93%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/details/Details.java (75%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/details/DetailsAdapter.java (93%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/details/group/Group.java (95%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/details/item/Item.java (93%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/details/item/ItemAdapter.java (94%) rename app/src/main/java/at/smartshopper/{smartshopper => smartshopperapp}/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java (91%) rename app/src/test/java/at/smartshopper/{smartshopper => smartshopperapp}/ExampleUnitTest.java (89%) diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index f3f6681b5a84b857536c2456310d3f164789686e..2c4486fd475f5674aed84da7091ce29f3fa9d661 100644 GIT binary patch delta 157 zcmZ4VO<=`0feqcNEX=cx>2K~=uf|DDAAvXiY<;qFAng6W3;n1rYQeZ#EC zr~)>C8EC+E>$l9kY%D(CeNSvZ^O>2;j!o%&$9<^c?e7g)5|~*)mTnI=WjW6Z0O?^s A3IG5A delta 182 zcmZ4SO<>VCfeqcNEEekxk~a6N@+q_A^V~YHd7(!>k7|g119J(3Ok#;%ac*K!NpVJg zK|yK}3a6l8dhR=B?aj%d(|K96CP#BO|4VBBm&6FfOxyn@F~96&S#fu^#PkP-ETYri xGAqg|;xlc#<6GulHkOF`Ie)fa`pnE_$8t1!*^%u)&85sNAlGb + package="at.smartshopper.smartshopperapp"> @@ -13,14 +13,14 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> - + - - + + @@ -28,7 +28,7 @@ diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/Colorpicker.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Colorpicker.java similarity index 97% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/Colorpicker.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/Colorpicker.java index 65cac2b..b051df5 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/Colorpicker.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Colorpicker.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; import android.content.Intent; import android.graphics.Color; @@ -12,7 +12,7 @@ import android.widget.LinearLayout; import com.github.danielnilsson9.colorpickerview.view.ColorPanelView; import com.github.danielnilsson9.colorpickerview.view.ColorPickerView; -import at.smartshopper.smartshopper.R; +import at.smartshopper.smartshopperapp.R; public class Colorpicker extends AppCompatActivity { diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java similarity index 98% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java index 4e4c6b8..394550a 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; import android.content.ClipData; import android.content.ClipboardManager; @@ -46,12 +46,12 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.db.Database; -import at.smartshopper.smartshopper.messaging.MyFirebaseSender; -import at.smartshopper.smartshopper.shoppinglist.Shoppinglist; -import at.smartshopper.smartshopper.shoppinglist.ShoppinglistAdapter; -import at.smartshopper.smartshopper.shoppinglist.ShoppinglistSharedAdapter; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.db.Database; +import at.smartshopper.smartshopperapp.messaging.MyFirebaseSender; +import at.smartshopper.smartshopperapp.shoppinglist.Shoppinglist; +import at.smartshopper.smartshopperapp.shoppinglist.ShoppinglistAdapter; +import at.smartshopper.smartshopperapp.shoppinglist.ShoppinglistSharedAdapter; public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnItemClicked, ShoppinglistAdapter.OnShoppinglistClick, ShoppinglistAdapter.OnChangeItemClick, ShoppinglistAdapter.OnShareClick, ShoppinglistSharedAdapter.SharedOnItemClicked, ShoppinglistSharedAdapter.SharedOnChangeItemClick, ShoppinglistSharedAdapter.SharedOnShareClick, ShoppinglistSharedAdapter.SharedOnShoppinglistClick { @@ -348,7 +348,6 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte colorBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - finish(); Intent intent = new Intent(Dash.this, Colorpicker.class); startActivityForResult(intent, 1); @@ -679,6 +678,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte } }); + popupAddShare = new PopupWindow(popupContentView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); finish.setOnClickListener(new View.OnClickListener() { @Override @@ -711,7 +711,7 @@ public class Dash extends AppCompatActivity implements ShoppinglistAdapter.OnIte } }); - popupAddShare = new PopupWindow(popupContentView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + popupAddShare.setOutsideTouchable(false); popupAddShare.setFocusable(true); // Set an elevation value for popup window diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/DoneItemActivity.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/DoneItemActivity.java similarity index 91% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/DoneItemActivity.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/DoneItemActivity.java index cfc3d53..c7a2d93 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/DoneItemActivity.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/DoneItemActivity.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; import android.content.Intent; import android.os.Bundle; @@ -15,12 +15,12 @@ import org.json.JSONException; import java.sql.SQLException; import java.util.List; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.customViews.SpaceItemDecoration; -import at.smartshopper.smartshopper.customViews.ToolbarHelper; -import at.smartshopper.smartshopper.db.Database; -import at.smartshopper.smartshopper.shoppinglist.details.item.Item; -import at.smartshopper.smartshopper.shoppinglist.details.item.ItemShoppinglistDetailsAdapter; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.customViews.SpaceItemDecoration; +import at.smartshopper.smartshopperapp.customViews.ToolbarHelper; +import at.smartshopper.smartshopperapp.db.Database; +import at.smartshopper.smartshopperapp.shoppinglist.details.item.Item; +import at.smartshopper.smartshopperapp.shoppinglist.details.item.ItemShoppinglistDetailsAdapter; public class DoneItemActivity extends AppCompatActivity { diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java similarity index 98% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java index dd3364f..865ee89 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; import android.Manifest; import android.app.Activity; @@ -17,7 +17,6 @@ import android.os.Bundle; import android.os.Environment; import android.support.annotation.NonNull; import android.support.v4.app.ActivityCompat; -import android.util.DisplayMetrics; import android.util.Log; import android.view.View; import android.widget.Button; @@ -45,9 +44,9 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.concurrent.ExecutionException; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.db.Database; -import at.smartshopper.smartshopper.shoppinglist.Member; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.db.Database; +import at.smartshopper.smartshopperapp.shoppinglist.Member; public class EditUser extends Activity { diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ItemListActivity.java similarity index 96% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/ItemListActivity.java index ad6bdf5..fd6a75d 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ItemListActivity.java @@ -1,6 +1,5 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; -import android.app.Activity; import android.content.Intent; import android.graphics.Color; import android.os.Build; @@ -34,13 +33,13 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.customViews.SpaceItemDecoration; -import at.smartshopper.smartshopper.customViews.ToolbarHelper; -import at.smartshopper.smartshopper.db.Database; -import at.smartshopper.smartshopper.messaging.MyFirebaseSender; -import at.smartshopper.smartshopper.shoppinglist.details.item.Item; -import at.smartshopper.smartshopper.shoppinglist.details.item.ItemAdapter; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.customViews.SpaceItemDecoration; +import at.smartshopper.smartshopperapp.customViews.ToolbarHelper; +import at.smartshopper.smartshopperapp.db.Database; +import at.smartshopper.smartshopperapp.messaging.MyFirebaseSender; +import at.smartshopper.smartshopperapp.shoppinglist.details.item.Item; +import at.smartshopper.smartshopperapp.shoppinglist.details.item.ItemAdapter; public class ItemListActivity extends AppCompatActivity implements ItemAdapter.OnItemEditClicked, ItemAdapter.OnItemDelClicked, ItemAdapter.OnItemCheckClicked { private String group_id, groupNameString; diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java similarity index 98% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java index 37648a8..baa65c1 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; import android.content.Intent; import android.os.Bundle; @@ -32,9 +32,9 @@ import org.json.JSONException; import java.sql.SQLException; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.db.Database; -import at.smartshopper.smartshopper.shoppinglist.Member; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.db.Database; +import at.smartshopper.smartshopperapp.shoppinglist.Member; public class LoginActivity extends AppCompatActivity { diff --git a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java similarity index 95% rename from app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java rename to app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java index 6b72b47..7c08f2d 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java @@ -1,6 +1,5 @@ -package at.smartshopper.smartshopper.activitys; +package at.smartshopper.smartshopperapp.activitys; -import android.app.Activity; import android.content.Intent; import android.graphics.Color; import android.os.Build; @@ -10,7 +9,6 @@ import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.view.Gravity; @@ -35,16 +33,16 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.customViews.SpaceItemDecoration; -import at.smartshopper.smartshopper.customViews.ToolbarHelper; -import at.smartshopper.smartshopper.db.Database; -import at.smartshopper.smartshopper.messaging.MyFirebaseSender; -import at.smartshopper.smartshopper.shoppinglist.Shoppinglist; -import at.smartshopper.smartshopper.shoppinglist.details.Details; -import at.smartshopper.smartshopper.shoppinglist.details.DetailsAdapter; -import at.smartshopper.smartshopper.shoppinglist.details.group.Group; -import at.smartshopper.smartshopper.shoppinglist.details.item.Item; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.customViews.SpaceItemDecoration; +import at.smartshopper.smartshopperapp.customViews.ToolbarHelper; +import at.smartshopper.smartshopperapp.db.Database; +import at.smartshopper.smartshopperapp.messaging.MyFirebaseSender; +import at.smartshopper.smartshopperapp.shoppinglist.Shoppinglist; +import at.smartshopper.smartshopperapp.shoppinglist.details.Details; +import at.smartshopper.smartshopperapp.shoppinglist.details.DetailsAdapter; +import at.smartshopper.smartshopperapp.shoppinglist.details.group.Group; +import at.smartshopper.smartshopperapp.shoppinglist.details.item.Item; public class ShoppinglistDetails extends AppCompatActivity implements DetailsAdapter.OnGroupEditClicked, DetailsAdapter.OnGroupDeleteClicked, DetailsAdapter.OnCardClicked { diff --git a/app/src/main/java/at/smartshopper/smartshopper/customViews/RoundCornersTransformation.java b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/RoundCornersTransformation.java similarity index 99% rename from app/src/main/java/at/smartshopper/smartshopper/customViews/RoundCornersTransformation.java rename to app/src/main/java/at/smartshopper/smartshopperapp/customViews/RoundCornersTransformation.java index 21feeca..4299483 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/customViews/RoundCornersTransformation.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/RoundCornersTransformation.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.customViews; +package at.smartshopper.smartshopperapp.customViews; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; diff --git a/app/src/main/java/at/smartshopper/smartshopper/customViews/SpaceItemDecoration.java b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/SpaceItemDecoration.java similarity index 93% rename from app/src/main/java/at/smartshopper/smartshopper/customViews/SpaceItemDecoration.java rename to app/src/main/java/at/smartshopper/smartshopperapp/customViews/SpaceItemDecoration.java index 8d796d0..f6799d9 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/customViews/SpaceItemDecoration.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/SpaceItemDecoration.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.customViews; +package at.smartshopper.smartshopperapp.customViews; import android.graphics.Rect; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/at/smartshopper/smartshopper/customViews/ToolbarHelper.java b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java similarity index 93% rename from app/src/main/java/at/smartshopper/smartshopper/customViews/ToolbarHelper.java rename to app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java index 810f316..06f6b09 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/customViews/ToolbarHelper.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.customViews; +package at.smartshopper.smartshopperapp.customViews; import android.app.Activity; import android.content.Context; @@ -22,11 +22,11 @@ import org.json.JSONException; import java.sql.SQLException; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.activitys.Dash; -import at.smartshopper.smartshopper.activitys.DoneItemActivity; -import at.smartshopper.smartshopper.activitys.LoginActivity; -import at.smartshopper.smartshopper.db.Database; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.activitys.Dash; +import at.smartshopper.smartshopperapp.activitys.DoneItemActivity; +import at.smartshopper.smartshopperapp.activitys.LoginActivity; +import at.smartshopper.smartshopperapp.db.Database; public class ToolbarHelper extends Activity { diff --git a/app/src/main/java/at/smartshopper/smartshopper/db/Database.java b/app/src/main/java/at/smartshopper/smartshopperapp/db/Database.java similarity index 99% rename from app/src/main/java/at/smartshopper/smartshopper/db/Database.java rename to app/src/main/java/at/smartshopper/smartshopperapp/db/Database.java index 4d8f978..fc8e654 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/db/Database.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/db/Database.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.db; +package at.smartshopper.smartshopperapp.db; import android.os.StrictMode; @@ -15,11 +15,11 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import at.smartshopper.smartshopper.shoppinglist.Member; -import at.smartshopper.smartshopper.shoppinglist.Shoppinglist; -import at.smartshopper.smartshopper.shoppinglist.details.Details; -import at.smartshopper.smartshopper.shoppinglist.details.group.Group; -import at.smartshopper.smartshopper.shoppinglist.details.item.Item; +import at.smartshopper.smartshopperapp.shoppinglist.Member; +import at.smartshopper.smartshopperapp.shoppinglist.Shoppinglist; +import at.smartshopper.smartshopperapp.shoppinglist.details.Details; +import at.smartshopper.smartshopperapp.shoppinglist.details.group.Group; +import at.smartshopper.smartshopperapp.shoppinglist.details.item.Item; public class Database { diff --git a/app/src/main/java/at/smartshopper/smartshopper/db/SerializableDatabase.java b/app/src/main/java/at/smartshopper/smartshopperapp/db/SerializableDatabase.java similarity index 91% rename from app/src/main/java/at/smartshopper/smartshopper/db/SerializableDatabase.java rename to app/src/main/java/at/smartshopper/smartshopperapp/db/SerializableDatabase.java index dff156a..bca6faa 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/db/SerializableDatabase.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/db/SerializableDatabase.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.db; +package at.smartshopper.smartshopperapp.db; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseMessagingService.java b/app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseMessagingService.java similarity index 96% rename from app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseMessagingService.java rename to app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseMessagingService.java index 1be0a9e..072a502 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseMessagingService.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseMessagingService.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.messaging; +package at.smartshopper.smartshopperapp.messaging; import android.app.NotificationManager; import android.app.PendingIntent; @@ -12,8 +12,8 @@ import android.util.Log; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.activitys.Dash; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.activitys.Dash; public class MyFirebaseMessagingService extends FirebaseMessagingService { diff --git a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java b/app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseSender.java similarity index 95% rename from app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java rename to app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseSender.java index 241aed8..064d8d2 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseSender.java @@ -1,11 +1,11 @@ -package at.smartshopper.smartshopper.messaging; +package at.smartshopper.smartshopperapp.messaging; import android.util.Log; import java.util.ArrayList; import java.util.List; -import at.smartshopper.smartshopper.shoppinglist.Member; +import at.smartshopper.smartshopperapp.shoppinglist.Member; import cz.msebera.android.httpclient.HttpResponse; import cz.msebera.android.httpclient.client.HttpClient; import cz.msebera.android.httpclient.client.methods.HttpGet; diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Member.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Member.java similarity index 91% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Member.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Member.java index 2ce7069..e8c3ff6 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Member.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Member.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.shoppinglist; +package at.smartshopper.smartshopperapp.shoppinglist; public class Member { private String uid, msid, name, pic, email; diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Shoppinglist.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Shoppinglist.java similarity index 95% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Shoppinglist.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Shoppinglist.java index bdd9898..a3d95a3 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Shoppinglist.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Shoppinglist.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.shoppinglist; +package at.smartshopper.smartshopperapp.shoppinglist; public class Shoppinglist { diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/ShoppinglistAdapter.java similarity index 95% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/ShoppinglistAdapter.java index 631f491..8f8e6a8 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/ShoppinglistAdapter.java @@ -1,8 +1,7 @@ -package at.smartshopper.smartshopper.shoppinglist; +package at.smartshopper.smartshopperapp.shoppinglist; import android.content.Context; import android.graphics.Color; -import android.net.Uri; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -14,7 +13,6 @@ import android.widget.TextView; import android.widget.Toast; import com.google.firebase.auth.FirebaseAuth; -import com.google.firebase.auth.FirebaseUser; import com.squareup.picasso.Picasso; import org.json.JSONException; @@ -22,9 +20,9 @@ import org.json.JSONException; import java.sql.SQLException; import java.util.List; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.customViews.RoundCornersTransformation; -import at.smartshopper.smartshopper.db.Database; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.customViews.RoundCornersTransformation; +import at.smartshopper.smartshopperapp.db.Database; public class ShoppinglistAdapter extends RecyclerView.Adapter { @@ -77,6 +75,9 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter { @@ -128,9 +128,13 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter implements ItemShoppinglistDetailsAdapter.OnItemEditClicked { @@ -72,7 +72,7 @@ public class DetailsAdapter extends RecyclerView.Adapter itemsList = details.get(i).getItems(); + List itemsList = details.get(i).getItems(); ItemShoppinglistDetailsAdapter itemAdapter = new ItemShoppinglistDetailsAdapter(itemsList); itemAdapter.setOnItemEditClick(this); itemsrecycle.setAdapter(itemAdapter); diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/group/Group.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/group/Group.java similarity index 95% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/group/Group.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/group/Group.java index 485096f..c2f2176 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/group/Group.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/group/Group.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.shoppinglist.details.group; +package at.smartshopper.smartshopperapp.shoppinglist.details.group; public class Group { diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/Item.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/Item.java similarity index 93% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/Item.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/Item.java index 79764e2..eba668e 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/Item.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/Item.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.shoppinglist.details.item; +package at.smartshopper.smartshopperapp.shoppinglist.details.item; public class Item { diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemAdapter.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemAdapter.java similarity index 94% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemAdapter.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemAdapter.java index 46de186..30949fc 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemAdapter.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemAdapter.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.shoppinglist.details.item; +package at.smartshopper.smartshopperapp.shoppinglist.details.item; import android.support.annotation.NonNull; import android.support.v7.widget.CardView; @@ -16,16 +16,16 @@ import com.squareup.picasso.Picasso; import java.util.List; -import at.smartshopper.smartshopper.R; +import at.smartshopper.smartshopperapp.R; public class ItemAdapter extends RecyclerView.Adapter { - private List data; + private List data; private OnItemEditClicked onItemEditClick; private OnItemDelClicked onItemDelClicked; private OnItemCheckClicked onItemCheckClick; - public ItemAdapter(List data) { + public ItemAdapter(List data) { this.data = data; } diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java similarity index 91% rename from app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java rename to app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java index 778e14f..61bb76d 100644 --- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java +++ b/app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper.shoppinglist.details.item; +package at.smartshopper.smartshopperapp.shoppinglist.details.item; import android.support.annotation.NonNull; import android.support.v7.widget.CardView; @@ -13,15 +13,15 @@ import org.json.JSONException; import java.sql.SQLException; import java.util.List; -import at.smartshopper.smartshopper.R; -import at.smartshopper.smartshopper.db.Database; +import at.smartshopper.smartshopperapp.R; +import at.smartshopper.smartshopperapp.db.Database; public class ItemShoppinglistDetailsAdapter extends RecyclerView.Adapter { - private List data; + private List data; private OnItemEditClicked onItemEditClick; - public ItemShoppinglistDetailsAdapter(List data) { + public ItemShoppinglistDetailsAdapter(List data) { this.data = data; } diff --git a/app/src/test/java/at/smartshopper/smartshopper/ExampleUnitTest.java b/app/src/test/java/at/smartshopper/smartshopperapp/ExampleUnitTest.java similarity index 89% rename from app/src/test/java/at/smartshopper/smartshopper/ExampleUnitTest.java rename to app/src/test/java/at/smartshopper/smartshopperapp/ExampleUnitTest.java index 0381e13..0827330 100644 --- a/app/src/test/java/at/smartshopper/smartshopper/ExampleUnitTest.java +++ b/app/src/test/java/at/smartshopper/smartshopperapp/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package at.smartshopper.smartshopper; +package at.smartshopper.smartshopperapp; import org.junit.Test;