dergeorg/SmartShopperAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Emulator funktioniert, aber am Handy sind einige knöpfe einfach weg

Browse Source 
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.
This commit is contained in:
Georg Reisinger 2019-03-20 01:53:48 +01:00
parent a57ee5bcb0
commit a967c8748e
30 changed files with 151 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

2
app/build.gradle
View File

@ -4,7 +4,7 @@ apply plugin: 'com.google.gms.google-services'
android {
compileSdkVersion 28
defaultConfig {
applicationId "at.smartshopper.smartshopper"
applicationId "at.smartshopper.smartshopperapp"
minSdkVersion 26
targetSdkVersion 28
versionCode 1

35
app/google-services.json
View File

@ -15,10 +15,41 @@
},
"oauth_client": [
{
"client_id": "221332577314-s875jesfrase013upk7koi349hkpc8nn.apps.googleusercontent.com",
"client_id": "221332577314-oo8b4uqtlgj75e7u7o3qt1vc96prfv52.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDz7MzopErZ6paAIaGGJAGY8Lx9kly5q2k"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:221332577314:android:33ebe9c1c19a0a72",
"android_client_info": {
"package_name": "at.smartshopper.smartshopperapp"
}
},
"oauth_client": [
{
"client_id": "221332577314-qtpmahdn74vu6np68t8tqnuup6tvffb7.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "at.smartshopper.smartshopper",
"package_name": "at.smartshopper.smartshopperapp",
"certificate_hash": "5b45cd94564fa6ffa90ed08d38d1ad48dd64681c"
}
},

2
app/src/androidTest/java/at/smartshopper/smartshopper/ExampleInstrumentedTest.java → app/src/androidTest/java/at/smartshopper/smartshopperapp/ExampleInstrumentedTest.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper;
package at.smartshopper.smartshopperapp;
import android.content.Context;
import android.support.test.InstrumentationRegistry;

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.smartshopper.smartshopper">
package="at.smartshopper.smartshopperapp">
<uses-permission android:name="android.permission.INTERNET" />
@ -13,14 +13,14 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity
android:name=".activitys.EditUser"
android:name="at.smartshopper.smartshopperapp.activitys.EditUser"
android:label="@string/title_activity_edit_user"></activity>
<activity android:name=".activitys.DoneItemActivity" />
<activity android:name="at.smartshopper.smartshopperapp.activitys.DoneItemActivity" />
<activity
android:name=".activitys.ItemListActivity"
android:name="at.smartshopper.smartshopperapp.activitys.ItemListActivity"
android:label="@string/title_activity_item_list" />
<activity android:name=".activitys.Colorpicker" />
<activity android:name=".activitys.LoginActivity">
<activity android:name="at.smartshopper.smartshopperapp.activitys.Colorpicker" />
<activity android:name="at.smartshopper.smartshopperapp.activitys.LoginActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -28,7 +28,7 @@
</intent-filter>
</activity>
<activity
android:name=".activitys.Dash"
android:name="at.smartshopper.smartshopperapp.activitys.Dash"
android:label="SmartShopper"
android:theme="@style/AppTheme" />
<!--
@ -46,14 +46,14 @@
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/colorAccent" /> <!-- [START firebase_service] -->
<service
android:name=".messaging.MyFirebaseMessagingService"
android:name="at.smartshopper.smartshopperapp.messaging.MyFirebaseMessagingService"
android:stopWithTask="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service> <!-- [END firebase_service] -->
<activity
android:name=".activitys.ShoppinglistDetails"
android:name="at.smartshopper.smartshopperapp.activitys.ShoppinglistDetails"
android:label="@string/title_activity_shoppinglist_details" />
</application>

4
app/src/main/java/at/smartshopper/smartshopper/activitys/Colorpicker.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/Colorpicker.java
View File

@ -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 {

18
app/src/main/java/at/smartshopper/smartshopper/activitys/Dash.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/Dash.java
View File

@ -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

14
app/src/main/java/at/smartshopper/smartshopper/activitys/DoneItemActivity.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/DoneItemActivity.java
View File

@ -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 {

9
app/src/main/java/at/smartshopper/smartshopper/activitys/EditUser.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/EditUser.java
View File

@ -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 {

17
app/src/main/java/at/smartshopper/smartshopper/activitys/ItemListActivity.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/ItemListActivity.java
View File

@ -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;

8
app/src/main/java/at/smartshopper/smartshopper/activitys/LoginActivity.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/LoginActivity.java
View File

@ -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 {

24
app/src/main/java/at/smartshopper/smartshopper/activitys/ShoppinglistDetails.java → app/src/main/java/at/smartshopper/smartshopperapp/activitys/ShoppinglistDetails.java
View File

@ -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 {

2
app/src/main/java/at/smartshopper/smartshopper/customViews/RoundCornersTransformation.java → app/src/main/java/at/smartshopper/smartshopperapp/customViews/RoundCornersTransformation.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.customViews;
package at.smartshopper.smartshopperapp.customViews;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;

2
app/src/main/java/at/smartshopper/smartshopper/customViews/SpaceItemDecoration.java → app/src/main/java/at/smartshopper/smartshopperapp/customViews/SpaceItemDecoration.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.customViews;
package at.smartshopper.smartshopperapp.customViews;
import android.graphics.Rect;
import android.support.v7.widget.RecyclerView;

12
app/src/main/java/at/smartshopper/smartshopper/customViews/ToolbarHelper.java → app/src/main/java/at/smartshopper/smartshopperapp/customViews/ToolbarHelper.java
View File

@ -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 {

12
app/src/main/java/at/smartshopper/smartshopper/db/Database.java → app/src/main/java/at/smartshopper/smartshopperapp/db/Database.java
View File

@ -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 {

2
app/src/main/java/at/smartshopper/smartshopper/db/SerializableDatabase.java → app/src/main/java/at/smartshopper/smartshopperapp/db/SerializableDatabase.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.db;
package at.smartshopper.smartshopperapp.db;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

6
app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseMessagingService.java → app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseMessagingService.java
View File

@ -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 {

4
app/src/main/java/at/smartshopper/smartshopper/messaging/MyFirebaseSender.java → app/src/main/java/at/smartshopper/smartshopperapp/messaging/MyFirebaseSender.java
View File

@ -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;

2
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Member.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Member.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.shoppinglist;
package at.smartshopper.smartshopperapp.shoppinglist;
public class Member {
private String uid, msid, name, pic, email;

2
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/Shoppinglist.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/Shoppinglist.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.shoppinglist;
package at.smartshopper.smartshopperapp.shoppinglist;
public class Shoppinglist {

13
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/ShoppinglistAdapter.java
View File

@ -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<ShoppinglistAdapter.ShoppinglistViewHolder> {
@ -77,6 +75,9 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter<ShoppinglistAdapte
beschreibung.setText(shoppinglist.getdescription());
Picasso.get().load(R.drawable.share).into(shareButton);
Picasso.get().load(R.drawable.bearbeiten).into(holder.bearbeiten);
Picasso.get().load(R.drawable.delete).into(holder.del);
//binding the data with the viewholder views
holder.textViewTitle.setText(shoppinglist.getname());
System.out.println(shoppinglist.getname());

18
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistSharedAdapter.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/ShoppinglistSharedAdapter.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.shoppinglist;
package at.smartshopper.smartshopperapp.shoppinglist;
import android.content.Context;
import android.graphics.Color;
@ -22,9 +22,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 ShoppinglistSharedAdapter extends RecyclerView.Adapter<ShoppinglistSharedAdapter.ShoppinglistViewHolder> {
@ -128,9 +128,13 @@ public class ShoppinglistSharedAdapter extends RecyclerView.Adapter<Shoppinglist
}
}
try {
Member admin = db.getAdmin(shoppinglist.getSlId());
Picasso.get().load(admin.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
holder.ownerName.setText(admin.getName());
if(!shoppinglist.getSlId().equals("empty")){
Member admin = db.getAdmin(shoppinglist.getSlId());
Picasso.get().load(admin.getPic()).resize(250, 250).transform(new RoundCornersTransformation(15, 15, true, true)).into(holder.imageView);
holder.ownerName.setText(admin.getName());
}
} catch (SQLException e) {
e.printStackTrace();
} catch (JSONException e) {

6
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/Details.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/Details.java
View File

@ -1,9 +1,9 @@
package at.smartshopper.smartshopper.shoppinglist.details;
package at.smartshopper.smartshopperapp.shoppinglist.details;
import java.util.ArrayList;
import at.smartshopper.smartshopper.shoppinglist.details.group.Group;
import at.smartshopper.smartshopper.shoppinglist.details.item.Item;
import at.smartshopper.smartshopperapp.shoppinglist.details.group.Group;
import at.smartshopper.smartshopperapp.shoppinglist.details.item.Item;
public class Details {

14
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/DetailsAdapter.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/DetailsAdapter.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.shoppinglist.details;
package at.smartshopper.smartshopperapp.shoppinglist.details;
import android.app.Activity;
import android.content.Intent;
@ -17,11 +17,11 @@ import com.squareup.picasso.Picasso;
import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.activitys.ItemListActivity;
import at.smartshopper.smartshopper.customViews.SpaceItemDecoration;
import at.smartshopper.smartshopper.db.Database;
import at.smartshopper.smartshopper.shoppinglist.details.item.ItemShoppinglistDetailsAdapter;
import at.smartshopper.smartshopperapp.R;
import at.smartshopper.smartshopperapp.activitys.ItemListActivity;
import at.smartshopper.smartshopperapp.customViews.SpaceItemDecoration;
import at.smartshopper.smartshopperapp.db.Database;
import at.smartshopper.smartshopperapp.shoppinglist.details.item.ItemShoppinglistDetailsAdapter;
public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHolder> implements ItemShoppinglistDetailsAdapter.OnItemEditClicked {
@ -72,7 +72,7 @@ public class DetailsAdapter extends RecyclerView.Adapter<DetailsAdapter.MyViewHo
itemsrecycle.setHasFixedSize(true);
itemsrecycle.setLayoutManager(new LinearLayoutManager(new Activity()));
List<at.smartshopper.smartshopper.shoppinglist.details.item.Item> itemsList = details.get(i).getItems();
List<at.smartshopper.smartshopperapp.shoppinglist.details.item.Item> itemsList = details.get(i).getItems();
ItemShoppinglistDetailsAdapter itemAdapter = new ItemShoppinglistDetailsAdapter(itemsList);
itemAdapter.setOnItemEditClick(this);
itemsrecycle.setAdapter(itemAdapter);

2
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/group/Group.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/group/Group.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.shoppinglist.details.group;
package at.smartshopper.smartshopperapp.shoppinglist.details.group;
public class Group {

2
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/Item.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/Item.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper.shoppinglist.details.item;
package at.smartshopper.smartshopperapp.shoppinglist.details.item;
public class Item {

8
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemAdapter.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemAdapter.java
View File

@ -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<ItemAdapter.MyViewHolder> {
private List<at.smartshopper.smartshopper.shoppinglist.details.item.Item> data;
private List<at.smartshopper.smartshopperapp.shoppinglist.details.item.Item> data;
private OnItemEditClicked onItemEditClick;
private OnItemDelClicked onItemDelClicked;
private OnItemCheckClicked onItemCheckClick;
public ItemAdapter(List<at.smartshopper.smartshopper.shoppinglist.details.item.Item> data) {
public ItemAdapter(List<at.smartshopper.smartshopperapp.shoppinglist.details.item.Item> data) {
this.data = data;
}

10
app/src/main/java/at/smartshopper/smartshopper/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java → app/src/main/java/at/smartshopper/smartshopperapp/shoppinglist/details/item/ItemShoppinglistDetailsAdapter.java
View File

@ -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<ItemShoppinglistDetailsAdapter.MyViewHolder> {
private List<at.smartshopper.smartshopper.shoppinglist.details.item.Item> data;
private List<at.smartshopper.smartshopperapp.shoppinglist.details.item.Item> data;
private OnItemEditClicked onItemEditClick;
public ItemShoppinglistDetailsAdapter(List<at.smartshopper.smartshopper.shoppinglist.details.item.Item> data) {
public ItemShoppinglistDetailsAdapter(List<at.smartshopper.smartshopperapp.shoppinglist.details.item.Item> data) {
this.data = data;
}

2
app/src/test/java/at/smartshopper/smartshopper/ExampleUnitTest.java → app/src/test/java/at/smartshopper/smartshopperapp/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package at.smartshopper.smartshopper;
package at.smartshopper.smartshopperapp;
import org.junit.Test;