diff --git a/app/build.gradle b/app/build.gradle index 3d6ebfe..4dffa4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,11 +40,12 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + implementation 'androidx.core:core-splashscreen:1.0.0' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.android.material:material:1.8.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 425a349..65c3294 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,8 @@ android:exported="false" android:noHistory="true" /> @@ -45,9 +46,6 @@ - \ No newline at end of file diff --git a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java index a966ac0..94094fc 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/MainActivity.java @@ -1,22 +1,19 @@ package com.capstone.foodify.Activity; +import android.annotation.SuppressLint; +import android.os.Bundle; +import android.view.MenuItem; +import androidx.core.splashscreen.SplashScreen; + import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.viewpager2.widget.ViewPager2; -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.View; - import com.capstone.foodify.R; import com.capstone.foodify.ViewPagerAdapter; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.navigation.NavigationBarView; -import java.util.Objects; - public class MainActivity extends AppCompatActivity { ViewPager2 viewPager2; @@ -27,6 +24,7 @@ public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + SplashScreen.installSplashScreen(this); setContentView(R.layout.activity_main); initComponent(); diff --git a/app/src/main/java/com/capstone/foodify/Activity/SplashScreenActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SplashScreenActivity.java deleted file mode 100644 index c8cb4dc..0000000 --- a/app/src/main/java/com/capstone/foodify/Activity/SplashScreenActivity.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.capstone.foodify.Activity; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.app.AppCompatDelegate; - -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; - -import com.capstone.foodify.R; - -public class SplashScreenActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_splash_screen); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - startActivity(new Intent(SplashScreenActivity.this, MainActivity.class)); - finish(); - } - }, 3000); - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/basket_icon.xml b/app/src/main/res/drawable/basket_icon.xml index 4c918ae..70cae0d 100644 --- a/app/src/main/res/drawable/basket_icon.xml +++ b/app/src/main/res/drawable/basket_icon.xml @@ -5,7 +5,7 @@ android:viewportHeight="22"> + android:fillColor="#ff8084"/> diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png index 9d07da9..bd41f95 100644 Binary files a/app/src/main/res/drawable/logo.png and b/app/src/main/res/drawable/logo.png differ diff --git a/app/src/main/res/layout/activity_food_detail.xml b/app/src/main/res/layout/activity_food_detail.xml index 36293bd..cd03ae5 100644 --- a/app/src/main/res/layout/activity_food_detail.xml +++ b/app/src/main/res/layout/activity_food_detail.xml @@ -287,6 +287,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal|center_vertical" android:visibility="gone" + android:indeterminateTint="@color/primaryColor" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml deleted file mode 100644 index 89d6ef2..0000000 --- a/app/src/main/res/layout/activity_splash_screen.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index 4c7aa1a..9d243aa 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -57,6 +57,7 @@ #FF000000 #FFFFFFFF - #2FDBBC + #ff8084 #A3A3A3 #F99928 #ACA5A5 diff --git a/app/src/main/res/values/splash.xml b/app/src/main/res/values/splash.xml new file mode 100644 index 0000000..a33aa13 --- /dev/null +++ b/app/src/main/res/values/splash.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file