diff --git a/app/build.gradle b/app/build.gradle index 148594c..4d8c764 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.xxpatx.os" minSdkVersion 24 targetSdkVersion 29 - versionCode 2 - versionName "1.0.1" + versionCode 3 + versionName "1.0.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java b/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java index fb25433..a163bd2 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java +++ b/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java @@ -118,19 +118,19 @@ public class ContactFragment extends BaseMvvmFragment contacts) { if (contacts == null || contacts.size() == 0) { - mViewDataBinding.tvNoContact.setVisibility(View.VISIBLE); + mViewDataBinding.clNodata.setVisibility(View.VISIBLE); mViewDataBinding.rvContact.setVisibility(View.GONE); } else { - mViewDataBinding.tvNoContact.setVisibility(View.GONE); + mViewDataBinding.clNodata.setVisibility(View.GONE); mViewDataBinding.rvContact.setVisibility(View.VISIBLE); } mContactAdapter.setContactList(contacts); diff --git a/app/src/main/java/com/xxpatx/os/fragment/custom/CustomFragment.java b/app/src/main/java/com/xxpatx/os/fragment/custom/CustomFragment.java index 8c1cbe6..019919b 100644 --- a/app/src/main/java/com/xxpatx/os/fragment/custom/CustomFragment.java +++ b/app/src/main/java/com/xxpatx/os/fragment/custom/CustomFragment.java @@ -818,13 +818,13 @@ public class CustomFragment extends BaseMvvmFragment diff --git a/app/src/main/res/layout-port/fragment_home.xml b/app/src/main/res/layout-port/fragment_home.xml index ebb5bfb..354ecdf 100644 --- a/app/src/main/res/layout-port/fragment_home.xml +++ b/app/src/main/res/layout-port/fragment_home.xml @@ -36,7 +36,6 @@ android:id="@+id/cl_weather" android:layout_width="330dp" android:layout_height="165dp" - android:background="@drawable/card_weather_background" android:onClick="@{click::toWeather}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/app/src/main/res/layout/fragment_contact_home.xml b/app/src/main/res/layout/fragment_contact_home.xml index 40e4625..028b923 100644 --- a/app/src/main/res/layout/fragment_contact_home.xml +++ b/app/src/main/res/layout/fragment_contact_home.xml @@ -27,7 +27,6 @@ android:id="@+id/cl_weather" android:layout_width="330dp" android:layout_height="165dp" - android:background="@drawable/card_weather_background" android:onClick="@{click::toWeather}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -147,39 +146,53 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cl_weather" /> + + + + + + + + - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 252ca11..895385c 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -32,7 +32,6 @@ android:id="@+id/cl_weather" android:layout_width="330dp" android:layout_height="165dp" - android:background="@drawable/card_weather_background" android:onClick="@{click::toWeather}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent">