diff --git a/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java index 54cf11a..6325977 100644 --- a/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java +++ b/app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java @@ -51,8 +51,6 @@ import retrofit2.Response; public class SplashActivity extends BaseActivity { - @BindView(R.id.campaign1ImageView) ImageView campaign1ImageView; - @BindView(R.id.campaign2ImageView) ImageView campaign2ImageView; @BindView(R.id.pizzappSplashLogoImageView) ImageView pizzappSplashLogoImageView; @BindView(R.id.postCodeTextView) TextView postCodeTextView; @@ -66,7 +64,6 @@ public class SplashActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_splash); ButterKnife.bind(this); - initViews(); //DisplayHelper.changeStatusColor(); if(NetworkHelper.isNetworkAvailable()){ getStoreList(); @@ -93,29 +90,6 @@ public class SplashActivity extends BaseActivity { } } - private void initViews(){ - - int imageViewWidth = DisplayHelper.getScreenWidthInPixel() - DisplayHelper.dpToPx(32); - int campaign1ImageViewHeight = imageViewWidth * 150 / 400; - int campaign2ImageViewHeight = imageViewWidth * 150 / 400; - int pizzapassLogoImageViewHeight = imageViewWidth * 409 / 910; - - LinearLayout.LayoutParams campaign1ImageViewLayoutParams = (LinearLayout.LayoutParams) campaign1ImageView.getLayoutParams(); - campaign1ImageViewLayoutParams.width = imageViewWidth; - campaign1ImageViewLayoutParams.height = campaign1ImageViewHeight; - campaign1ImageView.setLayoutParams(campaign1ImageViewLayoutParams); - - LinearLayout.LayoutParams campaign2ImageViewLayoutParams = (LinearLayout.LayoutParams) campaign2ImageView.getLayoutParams(); - campaign2ImageViewLayoutParams.width = imageViewWidth; - campaign2ImageViewLayoutParams.height = campaign2ImageViewHeight; - campaign2ImageView.setLayoutParams(campaign2ImageViewLayoutParams); - - LinearLayout.LayoutParams pizzappSplashLogoImageViewLayoutParams = (LinearLayout.LayoutParams) pizzappSplashLogoImageView.getLayoutParams(); - pizzappSplashLogoImageViewLayoutParams.width = imageViewWidth; - pizzappSplashLogoImageViewLayoutParams.height = pizzapassLogoImageViewHeight; - pizzappSplashLogoImageView.setLayoutParams(pizzappSplashLogoImageViewLayoutParams); - } - private void getStoreList(){ DialogHelper.showLoadingDialog(); Call> call = ApiService.apiInterface.getStoreList(); diff --git a/app/src/main/res/drawable/angebot1.jpg b/app/src/main/res/drawable/angebot1.jpg deleted file mode 100644 index 241bd43..0000000 Binary files a/app/src/main/res/drawable/angebot1.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/angebot2.jpg b/app/src/main/res/drawable/angebot2.jpg deleted file mode 100644 index d1162e3..0000000 Binary files a/app/src/main/res/drawable/angebot2.jpg and /dev/null differ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 502f058..98deb5d 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -15,40 +15,22 @@ android:scaleType="centerCrop" android:src="@drawable/background_wood"/> + + - - - - - - + android:layout_margin="8dp" + android:layout_centerInParent="true"> - - - - - - + \ No newline at end of file