diff --git a/app/src/main/java/com/snatik/matches/MainActivity.java b/app/src/main/java/com/snatik/matches/MainActivity.java
index 48f3656b..89199068 100644
--- a/app/src/main/java/com/snatik/matches/MainActivity.java
+++ b/app/src/main/java/com/snatik/matches/MainActivity.java
@@ -2,9 +2,12 @@
import android.graphics.Bitmap;
+import android.media.Image;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
+import android.view.View;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import com.snatik.matches.common.Shared;
import com.snatik.matches.engine.Engine;
@@ -18,6 +21,7 @@
public class MainActivity extends FragmentActivity {
private ImageView mBackgroundImage;
+ private LinearLayout mBackButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -29,6 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);
mBackgroundImage = (ImageView) findViewById(R.id.background_image);
+ mBackButton = (LinearLayout) findViewById(R.id.back_button);
Shared.activity = this;
Shared.engine.start();
@@ -40,7 +45,12 @@ protected void onCreate(Bundle savedInstanceState) {
// set menu
ScreenController.getInstance().openScreen(Screen.MENU);
-
+ mBackButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onBackPressed();
+ }
+ });
}
@Override
diff --git a/app/src/main/java/com/snatik/matches/ui/PopupManager.java b/app/src/main/java/com/snatik/matches/ui/PopupManager.java
index feebc0bd..e3f423f4 100644
--- a/app/src/main/java/com/snatik/matches/ui/PopupManager.java
+++ b/app/src/main/java/com/snatik/matches/ui/PopupManager.java
@@ -27,6 +27,12 @@ public static void showPopupSettings() {
imageView.setBackgroundColor(Color.parseColor("#88555555"));
imageView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
imageView.setClickable(true);
+ imageView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ closePopup();
+ }
+ });
popupContainer.addView(imageView);
// popup
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7235f11e..50282464 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,13 @@
android:id="@+id/background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop">
+
+
+
+
+
+
+
+
\ No newline at end of file