From 7880cc1acd7ae0339f8b659f4b7da8d9944c5aad Mon Sep 17 00:00:00 2001 From: rachmad Date: Sat, 22 Sep 2018 10:09:31 +0700 Subject: [PATCH 1/7] mengganti profile isi variabel kosong menjadi - --- app/src/main/res/layout/activity_challenge.xml | 3 ++- app/src/main/res/layout/fragment_profile.xml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/activity_challenge.xml b/app/src/main/res/layout/activity_challenge.xml index 05748fe..307e914 100644 --- a/app/src/main/res/layout/activity_challenge.xml +++ b/app/src/main/res/layout/activity_challenge.xml @@ -23,7 +23,8 @@ + android:hint="Alee" + android:fontFamily="casual"/> Date: Sat, 22 Sep 2018 04:23:06 +0700 Subject: [PATCH 2/7] mengganti beberapa value label menjadi - --- app/src/main/res/layout/fragment_profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index bf390c0..45a1944 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -231,7 +231,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.38" /> - Date: Sat, 22 Sep 2018 16:24:36 +0700 Subject: [PATCH 3/7] mengganti beberapa value label menjadi - --- app/src/main/res/layout/fragment_profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 45a1944..bf390c0 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -231,7 +231,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.38" /> - Date: Sat, 22 Sep 2018 17:26:34 +0700 Subject: [PATCH 4/7] mengganti lorem ipsum menjadi lebih jelas --- app/src/main/res/layout/fragment_level_select_easy.xml | 3 ++- app/src/main/res/layout/fragment_level_select_hard.xml | 3 ++- app/src/main/res/layout/fragment_level_select_medium.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_level_select_easy.xml b/app/src/main/res/layout/fragment_level_select_easy.xml index 10d2079..9131e87 100644 --- a/app/src/main/res/layout/fragment_level_select_easy.xml +++ b/app/src/main/res/layout/fragment_level_select_easy.xml @@ -123,7 +123,8 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:ellipsize="end" - android:text="Lorem ipsum dolor sit ametLorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum " + android:textAlignment="center" + android:text="pada level ini terdapat materi vocabulary (kosakata) yang sesuai untuk pemula" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/tv_masuk" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/fragment_level_select_hard.xml b/app/src/main/res/layout/fragment_level_select_hard.xml index 3627a74..2249701 100644 --- a/app/src/main/res/layout/fragment_level_select_hard.xml +++ b/app/src/main/res/layout/fragment_level_select_hard.xml @@ -122,7 +122,8 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:ellipsize="end" - android:text="Lorem ipsum dolor sit ametLorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum " + android:textAlignment="center" + android:text="pada level ini terdapat materi vocabulary (kosakata), wrting (menulis) dan speaking (berbicara) yang sesuai untuk ahli" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/textView6" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/fragment_level_select_medium.xml b/app/src/main/res/layout/fragment_level_select_medium.xml index 24940e6..38ca7ef 100644 --- a/app/src/main/res/layout/fragment_level_select_medium.xml +++ b/app/src/main/res/layout/fragment_level_select_medium.xml @@ -120,7 +120,8 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:ellipsize="end" - android:text="Lorem ipsum dolor sit ametLorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum " + android:textAlignment="center" + android:text="pada level ini terdapat materi vocabulary (kosakata) dan wrting (menulis) yang sesuai untuk menengah" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/textView6" app:layout_constraintStart_toStartOf="@+id/textView6" From adf7c2a5d3d93b9acec42cbf0472508e549e5798 Mon Sep 17 00:00:00 2001 From: rachmad Date: Sat, 22 Sep 2018 18:37:33 +0700 Subject: [PATCH 5/7] mengganti lorem ipsum menjadi lebih jelas --- app/src/main/res/layout/fragment_level_select_easy.xml | 2 +- app/src/main/res/layout/fragment_level_select_hard.xml | 2 +- app/src/main/res/layout/fragment_level_select_medium.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_level_select_easy.xml b/app/src/main/res/layout/fragment_level_select_easy.xml index 9131e87..5670b07 100644 --- a/app/src/main/res/layout/fragment_level_select_easy.xml +++ b/app/src/main/res/layout/fragment_level_select_easy.xml @@ -114,7 +114,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView5" /> - - - Date: Sat, 22 Sep 2018 18:38:12 +0700 Subject: [PATCH 6/7] mengganti lorem ipsum menjadi lebih jelas --- app/src/main/res/layout/fragment_level_select_easy.xml | 2 +- app/src/main/res/layout/fragment_level_select_hard.xml | 2 +- app/src/main/res/layout/fragment_level_select_medium.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_level_select_easy.xml b/app/src/main/res/layout/fragment_level_select_easy.xml index 5670b07..9131e87 100644 --- a/app/src/main/res/layout/fragment_level_select_easy.xml +++ b/app/src/main/res/layout/fragment_level_select_easy.xml @@ -114,7 +114,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView5" /> - - - Date: Sat, 22 Sep 2018 20:10:56 +0700 Subject: [PATCH 7/7] membuat input nama --- .../englishkidstalk/data/AppDataManager.java | 20 ++++++++++++++++++ .../data/prefs/AppPreferencesHelper.java | 21 +++++++++++++++++++ .../data/prefs/PreferencesHelper.java | 5 +++++ .../ui/inputnama/InputNamaActivity.java | 3 ++- .../main/res/layout/activity_input_nama.xml | 1 + 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/AppDataManager.java b/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/AppDataManager.java index e835b4d..e0e03d4 100644 --- a/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/AppDataManager.java +++ b/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/AppDataManager.java @@ -36,4 +36,24 @@ public AppDataManager(@ApplicationContext Context context, mPreferencesHelper = preferencesHelper; mApiHelper = apiHelper; } + + @Override + public void simpanNama(String nama) { + mPreferencesHelper.simpanNama(nama); + } + + @Override + public String getNama() { + return mPreferencesHelper.getNama(); + } + + @Override + public void setAvatar(int avatar) { + mPreferencesHelper.setAvatar(avatar); + } + + @Override + public int getAvatar() { + return mPreferencesHelper.getAvatar(); + } } diff --git a/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/AppPreferencesHelper.java b/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/AppPreferencesHelper.java index ad69d08..50ae086 100644 --- a/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/AppPreferencesHelper.java +++ b/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/AppPreferencesHelper.java @@ -25,4 +25,25 @@ public AppPreferencesHelper(@ApplicationContext Context context, @PreferenceInfo String prefFileName) { mPrefs = context.getSharedPreferences(prefFileName, Context.MODE_PRIVATE); } + + @Override + public void simpanNama(String nama) { + mPrefs.edit().putString("nama", nama).apply(); + } + + @Override + public String getNama() { + return mPrefs.getString("nama", null); + } + + @Override + public void setAvatar(int avatar) { + mPrefs.edit().putInt("avatar", avatar).apply(); + } + + @Override + public int getAvatar() { + return mPrefs.getInt("avatar",0); + } + } diff --git a/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/PreferencesHelper.java b/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/PreferencesHelper.java index edb1e93..b300c3a 100644 --- a/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/PreferencesHelper.java +++ b/app/src/main/java/com/squishydev/setoz/englishkidstalk/data/prefs/PreferencesHelper.java @@ -17,5 +17,10 @@ public interface PreferencesHelper { + void simpanNama(String nama); + String getNama(); + + void setAvatar(int avatar); + int getAvatar(); } diff --git a/app/src/main/java/com/squishydev/setoz/englishkidstalk/ui/inputnama/InputNamaActivity.java b/app/src/main/java/com/squishydev/setoz/englishkidstalk/ui/inputnama/InputNamaActivity.java index 33bf37e..e906b7c 100644 --- a/app/src/main/java/com/squishydev/setoz/englishkidstalk/ui/inputnama/InputNamaActivity.java +++ b/app/src/main/java/com/squishydev/setoz/englishkidstalk/ui/inputnama/InputNamaActivity.java @@ -18,7 +18,8 @@ protected void onCreate(Bundle savedInstanceState) { ActivityInputNamaBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_input_nama); - binding.btnNext.setOnClickListener(v ->{ + binding.btnNext.setOnClickListener(v -> { + startActivity(new Intent(InputNamaActivity.this, PilihAvatarActivity.class)); }); } diff --git a/app/src/main/res/layout/activity_input_nama.xml b/app/src/main/res/layout/activity_input_nama.xml index d60df7e..bf69192 100644 --- a/app/src/main/res/layout/activity_input_nama.xml +++ b/app/src/main/res/layout/activity_input_nama.xml @@ -32,6 +32,7 @@ tools:text="Kenalan Dulu Yuk" />