From dc55cca26c04a1e2c59dd3b8e8df8e9de42caa6d Mon Sep 17 00:00:00 2001 From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com> Date: Sat, 26 Jan 2019 17:34:19 +0100 Subject: [PATCH] Initial commit --- .gitattributes | 2 + .gitignore | 11 ++ .idea/codeStyles/Project.xml | 29 +++ .idea/gradle.xml | 18 ++ .idea/misc.xml | 38 ++++ .idea/runConfigurations.xml | 12 ++ app/.gitignore | 1 + app/build.gradle | 35 ++++ app/google-services.json | 55 ++++++ app/proguard-rules.pro | 21 ++ .../smartshopper/ExampleInstrumentedTest.java | 26 +++ app/src/main/AndroidManifest.xml | 26 +++ .../at/smartshopper/smartshopper/Dash.java | 119 +++++++++++ .../smartshopper/smartshopper/Database.java | 67 +++++++ .../smartshopper/LoginActivity.java | 184 ++++++++++++++++++ .../smartshopper/Shoppinglist.java | 39 ++++ .../smartshopper/ShoppinglistAdapter.java | 87 +++++++++ .../smartshopper/Shoppinglists.java | 13 ++ .../drawable-v24/ic_launcher_foreground.xml | 34 ++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++ app/src/main/res/drawable/logo.xml | 4 + app/src/main/res/layout/activity_dash.xml | 108 ++++++++++ app/src/main/res/layout/activity_login.xml | 90 +++++++++ app/src/main/res/layout/cardview.xml | 51 +++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2963 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4905 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2060 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2783 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4490 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6895 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6387 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10413 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 9128 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 15132 bytes app/src/main/res/values/colors.xml | 6 + app/src/main/res/values/dimens.xml | 3 + app/src/main/res/values/strings.xml | 4 + app/src/main/res/values/styles.xml | 20 ++ .../smartshopper/ExampleUnitTest.java | 17 ++ build.gradle | 27 +++ gradle.properties | 15 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 172 ++++++++++++++++ gradlew.bat | 84 ++++++++ settings.gradle | 1 + 48 files changed, 1604 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/google-services.json create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/at/smartshopper/smartshopper/ExampleInstrumentedTest.java create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/at/smartshopper/smartshopper/Dash.java create mode 100644 app/src/main/java/at/smartshopper/smartshopper/Database.java create mode 100644 app/src/main/java/at/smartshopper/smartshopper/LoginActivity.java create mode 100644 app/src/main/java/at/smartshopper/smartshopper/Shoppinglist.java create mode 100644 app/src/main/java/at/smartshopper/smartshopper/ShoppinglistAdapter.java create mode 100644 app/src/main/java/at/smartshopper/smartshopper/Shoppinglists.java create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/logo.xml create mode 100644 app/src/main/res/layout/activity_dash.xml create mode 100644 app/src/main/res/layout/activity_login.xml create mode 100644 app/src/main/res/layout/cardview.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/dimens.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/test/java/at/smartshopper/smartshopper/ExampleUnitTest.java create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfe0770 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fd45b12 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/caches/build_file_checksums.ser +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e0d5b93 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..36809f3 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +apply plugin: 'com.android.application' +apply plugin: 'com.google.gms.google-services' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "at.smartshopper.smartshopper" + minSdkVersion 19 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:design:28.0.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.google.firebase:firebase-auth:16.1.0' + implementation 'com.google.android.gms:play-services-auth:16.0.1' + implementation 'com.firebaseui:firebase-ui-auth:4.1.0' + // http://mvnrepository.com/artifact/postgresql/postgresql + implementation group: 'postgresql', name: 'postgresql', version: '9.1-901.jdbc4' +} diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..083a995 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,55 @@ +{ + "project_info": { + "project_number": "221332577314", + "firebase_url": "https://test-667ca.firebaseio.com", + "project_id": "test-667ca", + "storage_bucket": "test-667ca.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:221332577314:android:acb28f092122eb64", + "android_client_info": { + "package_name": "at.smartshopper.smartshopper" + } + }, + "oauth_client": [ + { + "client_id": "221332577314-s875jesfrase013upk7koi349hkpc8nn.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "at.smartshopper.smartshopper", + "certificate_hash": "5b45cd94564fa6ffa90ed08d38d1ad48dd64681c" + } + }, + { + "client_id": "221332577314-oo8b4uqtlgj75e7u7o3qt1vc96prfv52.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDz7MzopErZ6paAIaGGJAGY8Lx9kly5q2k" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "221332577314-obp1h7tvcl0q0ajkdcrnv7o90v0ssdjd.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/at/smartshopper/smartshopper/ExampleInstrumentedTest.java b/app/src/androidTest/java/at/smartshopper/smartshopper/ExampleInstrumentedTest.java new file mode 100644 index 0000000..83ac8b9 --- /dev/null +++ b/app/src/androidTest/java/at/smartshopper/smartshopper/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package at.smartshopper.smartshopper; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("at.smartshopper.smartshopper", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5cce6ac --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/at/smartshopper/smartshopper/Dash.java b/app/src/main/java/at/smartshopper/smartshopper/Dash.java new file mode 100644 index 0000000..1c1e85c --- /dev/null +++ b/app/src/main/java/at/smartshopper/smartshopper/Dash.java @@ -0,0 +1,119 @@ +package at.smartshopper.smartshopper; + +import android.net.Uri; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.widget.TabHost; + +import com.google.android.gms.tasks.OnCompleteListener; +import com.google.android.gms.tasks.Task; +import com.google.firebase.auth.FirebaseAuth; +import com.google.firebase.auth.FirebaseUser; +import com.google.firebase.auth.GetTokenResult; + +import org.json.JSONException; + +import java.util.List; +import java.util.jar.JarInputStream; + + +public class Dash extends AppCompatActivity { + + private Database db = new Database(); + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_dash); + + + + tabHoster(); + + + /* + Get userinformations + */ + final FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser(); + if (user != null) { + // Name, email address, and profile photo Url + String name = user.getDisplayName(); + String email = user.getEmail(); + Uri photoUrl = user.getPhotoUrl(); + RecyclerView ownRecycleView = (RecyclerView) findViewById(R.id.ownrecycler); + ownRecycleView.setHasFixedSize(true); + ownRecycleView.setLayoutManager(new LinearLayoutManager(this)); + + // Check if user's email is verified + boolean emailVerified = user.isEmailVerified(); + + // The user's ID, unique to the Firebase project. Do NOT use this value to + // authenticate with your backend server, if you have one. Use + // FirebaseUser.getIdToken() instead. + String uid = user.getUid(); + + try { + List ownListsList = db.getMyShoppinglists(uid); + + ShoppinglistAdapter shpAdapter = new ShoppinglistAdapter(Dash.this, ownListsList); + + ownRecycleView.setAdapter(shpAdapter); + }catch (JSONException e){ + e.printStackTrace(); + } + } + } + + /** + * Ist dafür Zuständig das es Tabs in der App gibt. Ohne dieser Funktion werden die Tabs nichtmehr Angezeigt. + * Hier wird auch der Name der Tabs gesetzt + */ + private void tabHoster() { + TabHost host = (TabHost) findViewById(R.id.tabHost1); + host.setup(); + + //Tab 1 + TabHost.TabSpec spec = host.newTabSpec("Eigene Einkaufslisten"); + spec.setContent(R.id.tab1); + spec.setIndicator("Eigene Einkaufslisten"); + host.addTab(spec); + + //Tab 2 + spec = host.newTabSpec("Geteilte Einkaufslisten"); + spec.setContent(R.id.tab2); + spec.setIndicator("Geteilte Einkaufslisten"); + host.addTab(spec); + } + + /* + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_main, menu); + return true; + } + + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} + */ + + +} diff --git a/app/src/main/java/at/smartshopper/smartshopper/Database.java b/app/src/main/java/at/smartshopper/smartshopper/Database.java new file mode 100644 index 0000000..fda8775 --- /dev/null +++ b/app/src/main/java/at/smartshopper/smartshopper/Database.java @@ -0,0 +1,67 @@ +package at.smartshopper.smartshopper; + +import android.os.StrictMode; +import android.util.Log; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; + +public class Database { + + private Connection conect; + final String HOST = "188.166.124.80"; + final String DB_NAME = "smartshopperdb"; + final String USERNAME = "smartshopper-user"; + final String PASSWORD = "jW^v#&LjNY_b3-k*jYj!U4Xz?T??m_D6249XAeWZ#7C^FRbKm!c_Dt+qj@4&a-Hs"; + final int PORT = 5432; + + + public Database(){}; + public void connectDatabase() throws SQLException { + StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); + StrictMode.setThreadPolicy(policy); + DriverManager.registerDriver(new org.postgresql.Driver()); + conect = DriverManager.getConnection("jdbc:postgresql://" + HOST + ":" + PORT + "/" + DB_NAME, USERNAME, PASSWORD); + + System.out.println("Database connected!"); + } + + public List getMyShoppinglists(String uid) throws JSONException { + try { + connectDatabase(); + } catch (SQLException e) { + e.printStackTrace(); + } + String SQL = "SELECT row_to_json(\"Shoppinglist\") AS obj FROM \"Shoppinglist\" JOIN \"Shoppinglist_admin\" USING (sl_id) WHERE username = ?"; + ArrayList shoppinglistsList = null; + try ( + Statement stmt = conect.createStatement(); + PreparedStatement pstmt = conect.prepareStatement(SQL)) { + pstmt.setString(1, uid); + ResultSet rs = pstmt.executeQuery(); + System.out.println(uid); + shoppinglistsList = new ArrayList(); + while (rs.next()) { + String shoppinglist = rs.getString(1); + JSONObject jsonObject = new JSONObject(shoppinglist); + + shoppinglistsList.add(new Shoppinglist(jsonObject.getString("sl_id"), jsonObject.getString("name"), jsonObject.getString("description"), jsonObject.getString("invitelink"), jsonObject.getString("color"))); + } + Log.d("DATABASE SHOPPINGLISTS", shoppinglistsList.toString()); + + } catch (SQLException ex) { + System.out.println(ex.getMessage()); + } + return (List) shoppinglistsList; + + } +} diff --git a/app/src/main/java/at/smartshopper/smartshopper/LoginActivity.java b/app/src/main/java/at/smartshopper/smartshopper/LoginActivity.java new file mode 100644 index 0000000..5593cfe --- /dev/null +++ b/app/src/main/java/at/smartshopper/smartshopper/LoginActivity.java @@ -0,0 +1,184 @@ +package at.smartshopper.smartshopper; + +import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +import com.google.android.gms.auth.api.signin.GoogleSignIn; +import com.google.android.gms.auth.api.signin.GoogleSignInAccount; +import com.google.android.gms.auth.api.signin.GoogleSignInClient; +import com.google.android.gms.auth.api.signin.GoogleSignInOptions; +import com.google.android.gms.common.SignInButton; +import com.google.android.gms.common.api.ApiException; +import com.google.android.gms.tasks.OnCompleteListener; +import com.google.android.gms.tasks.Task; +import com.google.firebase.auth.AuthCredential; +import com.google.firebase.auth.AuthResult; +import com.google.firebase.auth.FirebaseAuth; +import com.google.firebase.auth.FirebaseUser; +import com.google.firebase.auth.GoogleAuthProvider; + +public class LoginActivity extends AppCompatActivity { + + private static final String TAG = "SMASH"; + private static final int RC_SIGN_IN = 1; + private FirebaseAuth mAuth; + + SignInButton button; + GoogleSignInClient mGoogleSignInClient; + + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...); + if (requestCode == RC_SIGN_IN) { + Task task = GoogleSignIn.getSignedInAccountFromIntent(data); + try { + // Google Sign In was successful, authenticate with Firebase + GoogleSignInAccount account = task.getResult(ApiException.class); + firebaseAuthWithGoogle(account); + } catch (ApiException e) { + // Google Sign In failed, update UI appropriately + Log.w(TAG, "Google sign in failed", e); + // ... + } + } + } + + private void signInGoogle() { + Intent signInIntent = mGoogleSignInClient.getSignInIntent(); + startActivityForResult(signInIntent, RC_SIGN_IN); + } + + private void goDash() { + Intent intent = new Intent(this, Dash.class); + startActivity(intent); + } + + private void signInEmail(String email, String password) { + mAuth.signInWithEmailAndPassword(email, password) + .addOnCompleteListener(this, new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + if (task.isSuccessful()) { + // Sign in success, update UI with the signed-in user's information + Log.d(TAG, "signInWithEmail:success"); + FirebaseUser user = mAuth.getCurrentUser(); + goDash(); + } else { + // If sign in fails, display a message to the user. + Log.w(TAG, "signInWithEmail:failure", task.getException()); + Toast.makeText(LoginActivity.this, "Authentication failed.", + Toast.LENGTH_SHORT).show(); + } + + // ... + } + }); + } + + private void createAccount(String email, String password) { + mAuth.createUserWithEmailAndPassword(email, password) + .addOnCompleteListener(this, new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + if (task.isSuccessful()) { + // Sign in success, update UI with the signed-in user's information + Log.d(TAG, "createUserWithEmail:success"); + FirebaseUser user = mAuth.getCurrentUser(); + } else { + // If sign in fails, display a message to the user. + Log.w(TAG, "createUserWithEmail:failure", task.getException()); + Toast.makeText(LoginActivity.this, "Authentication failed.", + Toast.LENGTH_SHORT).show(); + } + + // ... + } + }); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_login); + mAuth = FirebaseAuth.getInstance(); + + Button loginEmailBtn = (Button) findViewById(R.id.loginEmailBtn); + final TextView email = (TextView) findViewById(R.id.email); + final TextView passwort = (TextView) findViewById(R.id.password); + button = (SignInButton) findViewById(R.id.loginGoogleBtn); + + + + loginEmailBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String emailstr = email.getText().toString(); + String passwortstr = passwort.getText().toString(); + signInEmail(emailstr, passwortstr); + } + }); + + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + signInGoogle(); + } + }); + + // Configure Google Sign In + GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) + .requestIdToken(getString(R.string.default_web_client_id)) + .requestEmail() + .build(); + + mGoogleSignInClient = GoogleSignIn.getClient(this, gso); + + + } + + private void firebaseAuthWithGoogle(GoogleSignInAccount acct) { + Log.d(TAG, "firebaseAuthWithGoogle:" + acct.getId()); + + AuthCredential credential = GoogleAuthProvider.getCredential(acct.getIdToken(), null); + mAuth.signInWithCredential(credential) + .addOnCompleteListener(this, new OnCompleteListener() { + @Override + public void onComplete(@NonNull Task task) { + if (task.isSuccessful()) { + // Sign in success, update UI with the signed-in user's information + Log.d(TAG, "signInWithCredential:success"); + FirebaseUser user = mAuth.getCurrentUser(); + goDash(); + } else { + // If sign in fails, display a message to the user. + Log.w(TAG, "signInWithCredential:failure", task.getException()); + Snackbar.make(findViewById(R.id.email), "Authentication Failed.", Snackbar.LENGTH_SHORT).show(); + + } + + // ... + } + }); + } + + @Override + public void onStart() { + super.onStart(); + + + if(null != mAuth.getCurrentUser()){ + goDash(); + } + + } +} diff --git a/app/src/main/java/at/smartshopper/smartshopper/Shoppinglist.java b/app/src/main/java/at/smartshopper/smartshopper/Shoppinglist.java new file mode 100644 index 0000000..b3ea0be --- /dev/null +++ b/app/src/main/java/at/smartshopper/smartshopper/Shoppinglist.java @@ -0,0 +1,39 @@ +package at.smartshopper.smartshopper; + +public class Shoppinglist { + + + + private String sl_id, name, description, invitelink, color; + + /** + * Erstellt ein Object von Shoppinglist. + * @param sl_id Shoppinglist ID + * @param name Shoppinglist Name + * @param description Shoppinglist Beschreibung + * @param invitelink Shoppinglist Einladungslink + * @param color Shoppinglist Farbe + */ + public Shoppinglist(String sl_id, String name, String description, String invitelink, String color){ + this.sl_id = sl_id; + this.name = name; + this.description = description; + this.invitelink = invitelink; + this.color = color; + } + + public String getSlId(){ + return this.sl_id; + } + + public String getname(){ + return this.name; + } + + public String getdescription(){return this.description;} + + public String getInvitelink(){return this.invitelink;} + + public String getcolor(){ return this.color;} + +} diff --git a/app/src/main/java/at/smartshopper/smartshopper/ShoppinglistAdapter.java b/app/src/main/java/at/smartshopper/smartshopper/ShoppinglistAdapter.java new file mode 100644 index 0000000..7abab11 --- /dev/null +++ b/app/src/main/java/at/smartshopper/smartshopper/ShoppinglistAdapter.java @@ -0,0 +1,87 @@ +package at.smartshopper.smartshopper; + +import android.content.Context; +import android.net.Uri; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.google.firebase.auth.FirebaseAuth; +import com.google.firebase.auth.FirebaseUser; + +import java.util.List; + +public class ShoppinglistAdapter extends RecyclerView.Adapter { + + + //this context we will use to inflate the layout + private Context mCtx; + + //we are storing all the products in a list + private List shoppinglist; + + //getting the context and product list with constructor + public ShoppinglistAdapter(Context mCtx, List shoppinglist) { + this.mCtx = mCtx; + this.shoppinglist = shoppinglist; + } + + @Override + public ShoppinglistViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + //inflating and returning our view holder + LayoutInflater inflater = LayoutInflater.from(mCtx); + View view = inflater.inflate(R.layout.cardview, null); + return new ShoppinglistViewHolder(view); + } + + @Override + public void onBindViewHolder(ShoppinglistViewHolder holder, int position) { + //getting the product of the specified position + Shoppinglist shoppinglist = this.shoppinglist.get(position); + + //binding the data with the viewholder views + holder.textViewTitle.setText(shoppinglist.getname()); + System.out.println(shoppinglist.getname()); + holder.textViewBeschreibung.setText(shoppinglist.getdescription()); + FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser(); + if (user != null) { + // Name, email address, and profile photo Url + String name = user.getDisplayName(); + Uri photoUrl = user.getPhotoUrl(); + holder.imageView.setImageURI(photoUrl); + + // Check if user's email is verified + + // The user's ID, unique to the Firebase project. Do NOT use this value to + // authenticate with your backend server, if you have one. Use + // FirebaseUser.getIdToken() instead. + } + + + + } + + + @Override + public int getItemCount() { + return shoppinglist.size(); + } + + + class ShoppinglistViewHolder extends RecyclerView.ViewHolder { + + TextView textViewTitle, textViewBeschreibung; + ImageView imageView; + + public ShoppinglistViewHolder(View itemView) { + super(itemView); + + textViewTitle = itemView.findViewById(R.id.shoppinglistName); + textViewBeschreibung = itemView.findViewById(R.id.shoppinglistBeschreibung); + imageView = itemView.findViewById(R.id.shoppinglistOwner); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/at/smartshopper/smartshopper/Shoppinglists.java b/app/src/main/java/at/smartshopper/smartshopper/Shoppinglists.java new file mode 100644 index 0000000..842f78f --- /dev/null +++ b/app/src/main/java/at/smartshopper/smartshopper/Shoppinglists.java @@ -0,0 +1,13 @@ +package at.smartshopper.smartshopper; + +import at.smartshopper.smartshopper.Shoppinglist; + +public class Shoppinglists { + + + + + public Shoppinglists(){ + + } +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml new file mode 100644 index 0000000..a8b409b --- /dev/null +++ b/app/src/main/res/drawable/logo.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_dash.xml b/app/src/main/res/layout/activity_dash.xml new file mode 100644 index 0000000..c6c5fbb --- /dev/null +++ b/app/src/main/res/layout/activity_dash.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + +