From c27e505e1413e764c2d38d75995f6cfb9e512a68 Mon Sep 17 00:00:00 2001 From: ThaDocIzN Date: Sun, 11 Nov 2018 09:12:49 -0600 Subject: [PATCH 1/4] added congress repo --- .idea/externalDependencies.xml | 6 ++++ app/build.gradle | 5 +++- app/src/main/AndroidManifest.xml | 4 +-- .../{ => activities}/ListActivity.java | 3 +- .../CongressPersonOverviewRepository.java | 18 +++++++++++ app/src/main/res/layout/activity_list.xml | 30 ++++++++++++------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- 8 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 .idea/externalDependencies.xml rename app/src/main/java/com/lambdaschool/congressdetails/{ => activities}/ListActivity.java (80%) create mode 100644 app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml new file mode 100644 index 0000000..180eacb --- /dev/null +++ b/.idea/externalDependencies.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0b6820d..e19679b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,10 +20,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0-rc02' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' implementation project(':congressdataapiaccess-debug') androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation project(':congressdataapiaccess-debug') + implementation 'android.arch.lifecycle:extensions:1.1.1' + implementation 'android.arch.lifecycle:viewmodel:1.1.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 26b1cb9..e1e0c8a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + - + diff --git a/app/src/main/java/com/lambdaschool/congressdetails/ListActivity.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java similarity index 80% rename from app/src/main/java/com/lambdaschool/congressdetails/ListActivity.java rename to app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java index 8be745a..e863342 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/ListActivity.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java @@ -1,9 +1,10 @@ -package com.lambdaschool.congressdetails; +package com.lambdaschool.congressdetails.activities; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import com.lambdaschool.congressdataapiaccess.CongressDao; +import com.lambdaschool.congressdetails.R; public class ListActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java b/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java new file mode 100644 index 0000000..4223c7d --- /dev/null +++ b/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java @@ -0,0 +1,18 @@ +package com.lambdaschool.congressdetails.repo; + +import android.arch.lifecycle.MutableLiveData; + +import com.lambdaschool.congressdataapiaccess.CongressDao; +import com.lambdaschool.congressdataapiaccess.CongresspersonOverview; + +import java.util.ArrayList; + +public class CongressPersonOverviewRepository { + + public static MutableLiveData>getOverList(){ + MutableLiveData> liveData = new MutableLiveData<>(); + ArrayList overviews = CongressDao.getAllMembers(); + liveData.setValue(overviews); + return liveData; + } +} diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 1884df2..c832b0a 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -1,18 +1,26 @@ - + android:orientation="vertical" + tools:context=".activities.ListActivity"> - + - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 077cb2f..8d3ef8e 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 95d3e5f..3c7c257 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 04 14:01:16 MDT 2018 +#Sun Nov 11 07:55:31 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From 514a031dc30b76128bbd5d7197394004e7d3321a Mon Sep 17 00:00:00 2001 From: ThaDocIzN Date: Sun, 11 Nov 2018 13:38:30 -0600 Subject: [PATCH 2/4] added a detail activity --- app/src/main/AndroidManifest.xml | 5 ++- .../activities/DetailCongressPerson.java | 15 +++++++ .../activities/ListActivity.java | 44 +++++++++++++++++++ .../viewModel/CongressOverviewViewModel.java | 25 +++++++++++ .../activity_detail_congress_person.xml | 9 ++++ app/src/main/res/layout/activity_list.xml | 6 ++- 6 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java create mode 100644 app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java create mode 100644 app/src/main/res/layout/activity_detail_congress_person.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e1e0c8a..6aa7055 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,9 @@ - + + + + \ No newline at end of file diff --git a/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java new file mode 100644 index 0000000..955c277 --- /dev/null +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java @@ -0,0 +1,15 @@ +package com.lambdaschool.congressdetails.activities; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import com.lambdaschool.congressdetails.R; + +public class DetailCongressPerson extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_detail_congress_person); + } +} diff --git a/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java index e863342..58735ed 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java @@ -1,19 +1,63 @@ package com.lambdaschool.congressdetails.activities; +import android.arch.lifecycle.Observer; +import android.arch.lifecycle.ViewModelProviders; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; import com.lambdaschool.congressdataapiaccess.CongressDao; +import com.lambdaschool.congressdataapiaccess.CongresspersonOverview; import com.lambdaschool.congressdetails.R; +import com.lambdaschool.congressdetails.viewModel.CongressOverviewViewModel; + +import java.util.ArrayList; public class ListActivity extends AppCompatActivity { + Context context; + CongressOverviewViewModel viewModel; + LinearLayout parentLayout; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_list); + context = this; + parentLayout = findViewById(R.id.parentlayout); + + viewModel = ViewModelProviders.of(this).get(CongressOverviewViewModel.class); + viewModel.getOverView().observe(this, new Observer>() { + @Override + public void onChanged(@Nullable ArrayList congresspersonOverviews) { + if (congresspersonOverviews != null){ + for (CongresspersonOverview person:congresspersonOverviews){ + parentLayout.addView(getDefaultTextView(person)); + + } + } + } + }); + CongressDao.getAllMembers(); } + + TextView getDefaultTextView(final CongresspersonOverview person){ + TextView view = new TextView(context); + String personName = String.format("%s %s", person.getFirstName(), person.getLastName()); + String idTag = person.getId(); + view.setTag(idTag); + view.setText(personName); + view.setTextSize(28); + + return view; + } } diff --git a/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java new file mode 100644 index 0000000..5f42e5a --- /dev/null +++ b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java @@ -0,0 +1,25 @@ +package com.lambdaschool.congressdetails.viewModel; + +import android.arch.lifecycle.MutableLiveData; +import android.arch.lifecycle.ViewModel; + +import com.lambdaschool.congressdataapiaccess.CongresspersonOverview; +import com.lambdaschool.congressdetails.repo.CongressPersonOverviewRepository; + +import java.util.ArrayList; + +public class CongressOverviewViewModel extends ViewModel { + + private MutableLiveData>overviewList; + + public MutableLiveData> getOverView(){ + if (overviewList == null){ + load(); + } + return overviewList; + } + + private void load(){ + overviewList = CongressPersonOverviewRepository.getOverList(); + } +} diff --git a/app/src/main/res/layout/activity_detail_congress_person.xml b/app/src/main/res/layout/activity_detail_congress_person.xml new file mode 100644 index 0000000..94d983f --- /dev/null +++ b/app/src/main/res/layout/activity_detail_congress_person.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index c832b0a..5a84f75 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -12,14 +12,16 @@ android:layout_height="wrap_content"> + android:orientation="vertical"> + android:singleLine="false" + android:text="Hello World" /> From 280d77d02c94fb42787124c7a5e41e6d1622dd45 Mon Sep 17 00:00:00 2001 From: ThaDocIzN Date: Mon, 12 Nov 2018 09:22:38 -0600 Subject: [PATCH 3/4] added viewmodel for congress person detail class --- .../activities/DetailCongressPerson.java | 31 +++++++++++++++++++ .../activities/ListActivity.java | 14 +++++++-- .../repo/DetailCongressPersonRepo.java | 16 ++++++++++ .../DetailCongressPersonViewModel.java | 22 +++++++++++++ .../activity_detail_congress_person.xml | 21 +++++++++++-- app/src/main/res/layout/activity_list.xml | 1 - 6 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java create mode 100644 app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java diff --git a/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java index 955c277..8a79495 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java @@ -1,15 +1,46 @@ package com.lambdaschool.congressdetails.activities; +import android.arch.lifecycle.Observer; +import android.arch.lifecycle.ViewModel; +import android.arch.lifecycle.ViewModelProviders; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; +import android.widget.TextView; +import com.lambdaschool.congressdataapiaccess.CongresspersonDetails; +import com.lambdaschool.congressdataapiaccess.CongresspersonOverview; import com.lambdaschool.congressdetails.R; +import com.lambdaschool.congressdetails.viewModel.DetailCongressPersonViewModel; public class DetailCongressPerson extends AppCompatActivity { + DetailCongressPersonViewModel viewModel; + TextView name; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_detail_congress_person); + + name = findViewById(R.id.textView); + + String congressPersonId = getIntent().getStringExtra(ListActivity.CONGRESS_PERSON_ID); + if (congressPersonId != null && congressPersonId != ""){ + viewModel = ViewModelProviders.of(this).get(DetailCongressPersonViewModel.class); + viewModel.getDetails(congressPersonId).observe(this, new Observer() { + @Override + public void onChanged(@Nullable CongresspersonDetails congresspersonDetails) { + if (congresspersonDetails != null){ + name.setText(congresspersonDetails.getFirstName()); + } + } + }); + } + } + } diff --git a/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java index 58735ed..fa6cdbb 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java @@ -7,7 +7,6 @@ import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -22,6 +21,7 @@ public class ListActivity extends AppCompatActivity { + public static final String CONGRESS_PERSON_ID = "person_id"; Context context; CongressOverviewViewModel viewModel; LinearLayout parentLayout; @@ -52,11 +52,19 @@ public void onChanged(@Nullable ArrayList congressperson TextView getDefaultTextView(final CongresspersonOverview person){ TextView view = new TextView(context); - String personName = String.format("%s %s", person.getFirstName(), person.getLastName()); - String idTag = person.getId(); + String personName = new StringBuilder().append(person.getFirstName()).append(" ").append(person.getLastName()).append("\n").append(person.getParty()).append("-").append(person.getState()).toString(); + final String idTag = person.getId(); view.setTag(idTag); view.setText(personName); view.setTextSize(28); + view.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intentCongressPerson = new Intent(context, DetailCongressPerson.class); + intentCongressPerson.putExtra(CONGRESS_PERSON_ID, idTag); + startActivity(intentCongressPerson); + } + }); return view; } diff --git a/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java b/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java new file mode 100644 index 0000000..8576b17 --- /dev/null +++ b/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java @@ -0,0 +1,16 @@ +package com.lambdaschool.congressdetails.repo; + +import android.arch.lifecycle.MutableLiveData; + +import com.lambdaschool.congressdataapiaccess.CongressDao; +import com.lambdaschool.congressdataapiaccess.CongresspersonDetails; + +public class DetailCongressPersonRepo { + + public static MutableLiveData getDetails(String id){ + final MutableLiveData liveData = new MutableLiveData<>(); + CongresspersonDetails profile = CongressDao.getMemberDetails(id); + liveData.setValue(profile); + return liveData; + } +} diff --git a/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java new file mode 100644 index 0000000..4431b43 --- /dev/null +++ b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java @@ -0,0 +1,22 @@ +package com.lambdaschool.congressdetails.viewModel; + +import android.arch.lifecycle.LiveData; +import android.arch.lifecycle.MutableLiveData; +import android.arch.lifecycle.ViewModel; + +import com.lambdaschool.congressdataapiaccess.CongresspersonDetails; +import com.lambdaschool.congressdetails.repo.DetailCongressPersonRepo; + +public class DetailCongressPersonViewModel extends ViewModel { + private MutableLiveData liveData; + public LiveData getDetails(String id){ + if (liveData == null){ + loadData(id); + } + return liveData; + } + + private void loadData(String id){ + liveData = DetailCongressPersonRepo.getDetails(id); + } +} diff --git a/app/src/main/res/layout/activity_detail_congress_person.xml b/app/src/main/res/layout/activity_detail_congress_person.xml index 94d983f..a079244 100644 --- a/app/src/main/res/layout/activity_detail_congress_person.xml +++ b/app/src/main/res/layout/activity_detail_congress_person.xml @@ -1,9 +1,26 @@ - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 5a84f75..57b40c7 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -20,7 +20,6 @@ From 3dc8081725b96b9a21670dfb994fab5c3c72d218 Mon Sep 17 00:00:00 2001 From: ThaDocIzN Date: Mon, 12 Nov 2018 09:56:00 -0600 Subject: [PATCH 4/4] updated text view attributes --- .../activities/DetailCongressPerson.java | 21 ++++++++------- .../activities/ListActivity.java | 8 +++--- .../CongressPersonOverviewRepository.java | 8 +++--- .../repo/DetailCongressPersonRepo.java | 2 +- .../viewModel/CongressOverviewViewModel.java | 8 +++--- .../DetailCongressPersonViewModel.java | 7 ++--- .../activity_detail_congress_person.xml | 27 +++++++++++++++---- app/src/main/res/layout/activity_list.xml | 9 +++---- app/src/main/res/values/dimens.xml | 5 ++++ 9 files changed, 58 insertions(+), 37 deletions(-) create mode 100644 app/src/main/res/values/dimens.xml diff --git a/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java index 8a79495..64084e1 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/DetailCongressPerson.java @@ -1,18 +1,13 @@ package com.lambdaschool.congressdetails.activities; import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModel; import android.arch.lifecycle.ViewModelProviders; -import android.content.Context; -import android.content.Intent; +import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; import android.widget.TextView; import com.lambdaschool.congressdataapiaccess.CongresspersonDetails; -import com.lambdaschool.congressdataapiaccess.CongresspersonOverview; import com.lambdaschool.congressdetails.R; import com.lambdaschool.congressdetails.viewModel.DetailCongressPersonViewModel; @@ -20,22 +15,28 @@ public class DetailCongressPerson extends AppCompatActivity { DetailCongressPersonViewModel viewModel; TextView name; + TextView dateOfBirth; + TextView gender; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_detail_congress_person); - name = findViewById(R.id.textView); + name = findViewById(R.id.textViewName); + dateOfBirth = findViewById(R.id.textViewDateOfBirth); + gender = findViewById(R.id.textViewGender); String congressPersonId = getIntent().getStringExtra(ListActivity.CONGRESS_PERSON_ID); - if (congressPersonId != null && congressPersonId != ""){ + if (congressPersonId != null && congressPersonId != "") { viewModel = ViewModelProviders.of(this).get(DetailCongressPersonViewModel.class); viewModel.getDetails(congressPersonId).observe(this, new Observer() { @Override public void onChanged(@Nullable CongresspersonDetails congresspersonDetails) { - if (congresspersonDetails != null){ - name.setText(congresspersonDetails.getFirstName()); + if (congresspersonDetails != null) { + name.setText(new StringBuilder().append(congresspersonDetails.getFirstName()).append(" ").append(congresspersonDetails.getLastName()).toString()); + dateOfBirth.setText(new StringBuilder().append("Born: ").append(congresspersonDetails.getDateOfBirth()).toString()); + gender.setText(new StringBuilder().append("Gender: ").append(congresspersonDetails.getGender()).toString()); } } }); diff --git a/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java index fa6cdbb..c47807d 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/activities/ListActivity.java @@ -4,9 +4,9 @@ import android.arch.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -38,8 +38,8 @@ protected void onCreate(Bundle savedInstanceState) { viewModel.getOverView().observe(this, new Observer>() { @Override public void onChanged(@Nullable ArrayList congresspersonOverviews) { - if (congresspersonOverviews != null){ - for (CongresspersonOverview person:congresspersonOverviews){ + if (congresspersonOverviews != null) { + for (CongresspersonOverview person : congresspersonOverviews) { parentLayout.addView(getDefaultTextView(person)); } @@ -50,7 +50,7 @@ public void onChanged(@Nullable ArrayList congressperson CongressDao.getAllMembers(); } - TextView getDefaultTextView(final CongresspersonOverview person){ + TextView getDefaultTextView(final CongresspersonOverview person) { TextView view = new TextView(context); String personName = new StringBuilder().append(person.getFirstName()).append(" ").append(person.getLastName()).append("\n").append(person.getParty()).append("-").append(person.getState()).toString(); final String idTag = person.getId(); diff --git a/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java b/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java index 4223c7d..e34abea 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/repo/CongressPersonOverviewRepository.java @@ -9,10 +9,10 @@ public class CongressPersonOverviewRepository { - public static MutableLiveData>getOverList(){ + public static MutableLiveData> getOverList() { MutableLiveData> liveData = new MutableLiveData<>(); - ArrayList overviews = CongressDao.getAllMembers(); - liveData.setValue(overviews); - return liveData; + ArrayList rawData = CongressDao.getAllMembers(); + liveData.setValue(rawData); + return liveData; } } diff --git a/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java b/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java index 8576b17..5da95d4 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/repo/DetailCongressPersonRepo.java @@ -7,7 +7,7 @@ public class DetailCongressPersonRepo { - public static MutableLiveData getDetails(String id){ + public static MutableLiveData getDetails(String id) { final MutableLiveData liveData = new MutableLiveData<>(); CongresspersonDetails profile = CongressDao.getMemberDetails(id); liveData.setValue(profile); diff --git a/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java index 5f42e5a..38d3f91 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/CongressOverviewViewModel.java @@ -10,16 +10,16 @@ public class CongressOverviewViewModel extends ViewModel { - private MutableLiveData>overviewList; + private MutableLiveData> overviewList; - public MutableLiveData> getOverView(){ - if (overviewList == null){ + public MutableLiveData> getOverView() { + if (overviewList == null) { load(); } return overviewList; } - private void load(){ + private void load() { overviewList = CongressPersonOverviewRepository.getOverList(); } } diff --git a/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java index 4431b43..a464f78 100644 --- a/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java +++ b/app/src/main/java/com/lambdaschool/congressdetails/viewModel/DetailCongressPersonViewModel.java @@ -9,14 +9,15 @@ public class DetailCongressPersonViewModel extends ViewModel { private MutableLiveData liveData; - public LiveData getDetails(String id){ - if (liveData == null){ + + public LiveData getDetails(String id) { + if (liveData == null) { loadData(id); } return liveData; } - private void loadData(String id){ + private void loadData(String id) { liveData = DetailCongressPersonRepo.getDetails(id); } } diff --git a/app/src/main/res/layout/activity_detail_congress_person.xml b/app/src/main/res/layout/activity_detail_congress_person.xml index a079244..ca87479 100644 --- a/app/src/main/res/layout/activity_detail_congress_person.xml +++ b/app/src/main/res/layout/activity_detail_congress_person.xml @@ -1,10 +1,8 @@ + android:layout_margin="@dimen/margin" + android:orientation="vertical"> + android:layout_margin="@dimen/margin" + android:gravity="center" + android:textSize="@dimen/text_size" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 57b40c7..4cf6d19 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -1,6 +1,5 @@ + android:layout_height="wrap_content" + android:layout_margin="@dimen/margin"> - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..8de3b77 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 24sp + 8dp + \ No newline at end of file