From 172c0de8eb0406b9a9ee1230f176998c069e88f7 Mon Sep 17 00:00:00 2001
From: unknown <leo112071@gmail.com>
Date: Fri, 23 Feb 2018 19:24:23 +0700
Subject: [PATCH] History use shared preferences user
---
.idea/modules.xml | 2 +-
app/src/main/AndroidManifest.xml | 2 +-
.../leo/fitnessdiy/HIstoryActivity.java | 17 +++--
.../example/leo/fitnessdiy/LoginActivity.java | 69 ++++++++++++-------
app/src/main/res/layout/activity_history.xml | 6 +-
app/src/main/res/layout/activity_login.xml | 7 ++
app/src/main/res/layout/jogging_card.xml | 4 +-
app/src/main/res/layout/plank_card.xml | 6 +-
app/src/main/res/layout/pushup_card.xml | 6 +-
app/src/main/res/layout/situp_card.xml | 6 +-
gradle.properties | 6 +-
11 files changed, 89 insertions(+), 42 deletions(-)
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e7f8ce2..2307b59 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
<module fileurl="file://F:\informatika\pbd\fitness\android.iml" filepath="F:\informatika\pbd\fitness\android.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+ <module fileurl="file://$PROJECT_DIR$/fitness.iml" filepath="$PROJECT_DIR$/fitness.iml" />
<module fileurl="file://D:\tugas\sem6\pbd\tubes\android\fitness.iml" filepath="D:\tugas\sem6\pbd\tubes\android\fitness.iml" />
<module fileurl="file://D:\Semester 6\PBD\Tugas Besar\android\fitness.iml" filepath="D:\Semester 6\PBD\Tugas Besar\android\fitness.iml" />
</modules>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d67ba61..8049665 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
android:theme="@style/AppThemeNoTitle" />
<activity
android:name=".HIstoryActivity"
- android:theme="@style/AppTheme" />
+ android:theme="@style/AppThemeNoTitle" />
<activity
android:name=".HomeActivity"
android:theme="@style/AppTheme" />
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
index 5b4e4aa..0475ad7 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
@@ -2,6 +2,7 @@ package com.example.leo.fitnessdiy;
import android.content.Context;
+import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
@@ -21,6 +22,7 @@ import com.example.leo.fitnessdiy.model.Jogging;
import com.example.leo.fitnessdiy.model.Plank;
import com.example.leo.fitnessdiy.model.PushUp;
import com.example.leo.fitnessdiy.model.SitUp;
+import com.example.leo.fitnessdiy.model.UsersSharedPreferences;
import com.example.leo.fitnessdiy.routes.api;
@@ -46,6 +48,9 @@ public class HIstoryActivity extends AppCompatActivity {
private List<Plank> plankHistory = new ArrayList<>();
private List<SitUp> situpHistory = new ArrayList<>();
public static final String TAG = HIstoryActivity.class.getSimpleName();
+ private int iduser;
+ private SharedPreferences mPreferences;
+ private String sharedPrefFile = "com.example.leo.fitnessdiy";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -56,6 +61,10 @@ public class HIstoryActivity extends AppCompatActivity {
final PlankListAdapter plankListAdapter = new PlankListAdapter(plankHistory, this);
+ mPreferences = getSharedPreferences(sharedPrefFile, MODE_PRIVATE);
+
+ iduser = mPreferences.getInt(UsersSharedPreferences.ID_USERS, 0);
+
jogging = (CardView) findViewById(R.id.jogging);
jogging.setVisibility(View.GONE);
jogging.setOnClickListener(new View.OnClickListener() {
@@ -106,7 +115,7 @@ public class HIstoryActivity extends AppCompatActivity {
public void getJoggingData() {
try {
String response = NetworkUtils.getResponseFromHttpUrl(
- new URL(api.JOGGING_HISTORY_URL + "1")
+ new URL(api.JOGGING_HISTORY_URL + iduser)
);
Log.d(TAG, response);
JSONArray jsonArray = new JSONArray(response);
@@ -133,7 +142,7 @@ public class HIstoryActivity extends AppCompatActivity {
public void getPlankData() {
try {
String response = NetworkUtils.getResponseFromHttpUrl(
- new URL(api.PLANK_HISTORY_URL + "1")
+ new URL(api.PLANK_HISTORY_URL + iduser)
);
Log.d(TAG, response);
JSONArray jsonArray = new JSONArray(response);
@@ -158,7 +167,7 @@ public class HIstoryActivity extends AppCompatActivity {
public void getPushupData() {
try {
String response = NetworkUtils.getResponseFromHttpUrl(
- new URL(api.PUSHUP_HISTORY_URL + "1")
+ new URL(api.PUSHUP_HISTORY_URL + iduser)
);
Log.d(TAG, response);
JSONArray jsonArray = new JSONArray(response);
@@ -183,7 +192,7 @@ public class HIstoryActivity extends AppCompatActivity {
public void getSitupData() {
try {
String response = NetworkUtils.getResponseFromHttpUrl(
- new URL(api.SITUP_HISTORY_URL + "1")
+ new URL(api.SITUP_HISTORY_URL + iduser)
);
Log.d(TAG, response);
JSONArray jsonArray = new JSONArray(response);
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java
index 2685d60..e1d0768 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/LoginActivity.java
@@ -1,14 +1,17 @@
package com.example.leo.fitnessdiy;
+import android.annotation.SuppressLint;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
+import android.os.AsyncTask;
import android.os.StrictMode;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
+import android.widget.ProgressBar;
import android.widget.Toast;
import com.example.leo.fitnessdiy.model.Users;
@@ -47,38 +50,58 @@ public class LoginActivity extends AppCompatActivity {
}
}
+ @SuppressLint("StaticFieldLeak")
public void doLogin(View view) {
- EditText edit_text_email = (EditText)findViewById(R.id.login_email);
- EditText edit_text_password = (EditText)findViewById(R.id.login_password);
- String email = edit_text_email.getText().toString();
- String password = edit_text_password.getText().toString();
- String response = "";
- Users user = null;
- try {
- response = getResponseFromHttpUrlPost(email, password);
+ new AsyncTask<Void, Void, Void>() {
+ Users user = null;
+ @Override
+ protected void onPreExecute() {
+ ProgressBar p = (ProgressBar) findViewById(R.id.login_loading);
+ p.setVisibility(View.VISIBLE);
+ }
+
+ @Override
+ protected Void doInBackground(Void... voids) {
+ EditText edit_text_email = (EditText)findViewById(R.id.login_email);
+ EditText edit_text_password = (EditText)findViewById(R.id.login_password);
+ String email = edit_text_email.getText().toString();
+ String password = edit_text_password.getText().toString();
+ String response = "";
+
+ try {
+ response = getResponseFromHttpUrlPost(email, password);
// Log.d("RESPONSE", response);
- } catch (IOException e){
- e.printStackTrace();
- }
- if(!response.equals("not_found")) {
- Log.d(LOG_TAG, response);
- user = Users.initializeData(response);
+ } catch (IOException e){
+ e.printStackTrace();
+ }
+ if(!response.equals("not_found")) {
+ Log.d(LOG_TAG, response);
+ user = Users.initializeData(response);
// Log.d(LOG_TAG, "" + user.getId());
// Log.d(LOG_TAG, user.getUsername());
// Log.d(LOG_TAG, user.getEmail());
// Log.d(LOG_TAG, user.getLevel());
- mPreferences = getSharedPreferences(sharedPrefFile, MODE_PRIVATE);
- UsersSharedPreferences.setUserSharedPreferences(mPreferences, user);
+ mPreferences = getSharedPreferences(sharedPrefFile, MODE_PRIVATE);
+ UsersSharedPreferences.setUserSharedPreferences(mPreferences, user);
// Log.d(LOG_TAG, mPreferences.getString(UsersSharedPreferences.EMAIL_USERS, "user tidak ditemukan"));
// Log.d(LOG_TAG, mPreferences.getString(UsersSharedPreferences.PASSWORD_USERS, "user tidak ditemukan"));
- }
- if(user == null){
- Toast.makeText(getApplicationContext(), "Email atau password salah", Toast.LENGTH_SHORT).show();
- } else {
+ }
+ return null;
+ }
- Intent i = new Intent(getApplicationContext(), HomeActivity.class);
- startActivity(i);
- }
+ @Override
+ protected void onPostExecute(Void aVoid) {
+ ProgressBar p = (ProgressBar) findViewById(R.id.login_loading);
+ p.setVisibility(View.GONE);
+ if(user == null){
+ Toast.makeText(getApplicationContext(), "Email atau password salah", Toast.LENGTH_SHORT).show();
+ } else {
+
+ Intent i = new Intent(getApplicationContext(), HomeActivity.class);
+ startActivity(i);
+ }
+ }
+ }.execute();
}
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index 661298e..a56df16 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -68,7 +68,7 @@
android:layout_height="40dp"
android:layout_marginRight="8dp"
android:contentDescription="TODO"
- android:src="@drawable/jogging_icon"/>
+ android:src="@drawable/plank_icon"/>
<TextView
android:id="@+id/plank_title"
@@ -111,7 +111,7 @@
android:layout_height="40dp"
android:layout_marginRight="8dp"
android:contentDescription="TODO"
- android:src="@drawable/jogging_icon"/>
+ android:src="@drawable/pushup_icon"/>
<TextView
android:id="@+id/pushup_title"
@@ -154,7 +154,7 @@
android:layout_height="40dp"
android:layout_marginRight="8dp"
android:contentDescription="TODO"
- android:src="@drawable/jogging_icon"/>
+ android:src="@drawable/situp_icon"/>
<TextView
android:id="@+id/situp_title"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index eb40c44..5756fbb 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -59,4 +59,11 @@
android:background="@drawable/buttton_grey"
android:onClick="toRegister"
android:text="Don't Have Account?" />
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/login_loading"
+ android:layout_gravity="center"
+ android:visibility="gone"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/jogging_card.xml b/app/src/main/res/layout/jogging_card.xml
index b23e2e4..fdde6e6 100644
--- a/app/src/main/res/layout/jogging_card.xml
+++ b/app/src/main/res/layout/jogging_card.xml
@@ -9,12 +9,14 @@
android:id="@+id/jogging_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat.Title" />
+ style="@style/TextAppearance.AppCompat.Title"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/jogging_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textColor="#000000"
style="@style/TextAppearance.AppCompat" />
<TextView
diff --git a/app/src/main/res/layout/plank_card.xml b/app/src/main/res/layout/plank_card.xml
index 1bd41b6..35b4fdb 100644
--- a/app/src/main/res/layout/plank_card.xml
+++ b/app/src/main/res/layout/plank_card.xml
@@ -9,13 +9,15 @@
android:id="@+id/plank_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat.Title" />
+ style="@style/TextAppearance.AppCompat.Title"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/plank_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat" />
+ style="@style/TextAppearance.AppCompat"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/plank_duration"
diff --git a/app/src/main/res/layout/pushup_card.xml b/app/src/main/res/layout/pushup_card.xml
index fa80ca3..2643a62 100644
--- a/app/src/main/res/layout/pushup_card.xml
+++ b/app/src/main/res/layout/pushup_card.xml
@@ -9,13 +9,15 @@
android:id="@+id/pushup_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat.Title" />
+ style="@style/TextAppearance.AppCompat.Title"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/pushup_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat" />
+ style="@style/TextAppearance.AppCompat"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/push_frequency"
diff --git a/app/src/main/res/layout/situp_card.xml b/app/src/main/res/layout/situp_card.xml
index c1e7e51..83174a2 100644
--- a/app/src/main/res/layout/situp_card.xml
+++ b/app/src/main/res/layout/situp_card.xml
@@ -9,13 +9,15 @@
android:id="@+id/situp_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat.Title" />
+ style="@style/TextAppearance.AppCompat.Title"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/situp_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat" />
+ style="@style/TextAppearance.AppCompat"
+ android:textColor="#000000"/>
<TextView
android:id="@+id/situp_frequency"
diff --git a/gradle.properties b/gradle.properties
index fb44349..0b010d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,8 +12,8 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-#Fri Feb 23 14:55:09 ICT 2018
-systemProp.http.proxyPassword=07007831
+#Fri Feb 23 16:26:33 GMT+07:00 2018
+systemProp.http.proxyPassword=02414056
systemProp.http.proxyHost=cache.itb.ac.id
-systemProp.http.proxyUser=rizki_halasan
systemProp.http.proxyPort=8080
+systemProp.http.proxyUser=leo16515325
--
GitLab