From 267f77dcec3bdb60c01a59d30b0f3f5f89d59658 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Wed, 12 Apr 2017 00:11:15 +0200
Subject: [PATCH] Changed to Production URL
---
.../ms/warpzone/warppay/MainActivity.java | 35 +------------------
.../warpzone/warppay/manager/MainManager.java | 2 +-
2 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
index 7609fcb..cbdc750 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/MainActivity.java
@@ -16,7 +16,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import android.view.WindowManager;
import android.widget.Toast;
import java.util.ArrayList;
@@ -51,7 +50,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
getWindow().addFlags(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
setContentView(R.layout.activity_main);
this.findViewById(R.id.mainLayout).setOnKeyListener(this);
@@ -152,9 +151,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
});
this.barcodeLearnDialog.show();
break;
- case R.id.action_exit:
- finish();
- break;
default:
break;
}
@@ -208,33 +204,4 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
// nothing to do here
// … really
}
-/*
-
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- if (event.getAction()==KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
- if(this.atxvAdapter.getCount() == 1) {
- setCurrentUser(SQLiteService.getInstance().remoteGetUser(((User) this.atxvAdapter.getItem(0)).getUserid()));
- this.atxvName.setText(this.atxvAdapter.getItem(0).toString());
- this.atxvName.dismissDropDown();
- }
- return true;
- }
- return false;
- }
-
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- setCurrentUser(SQLiteService.getInstance().remoteGetUser(((User) this.atxvAdapter.getItem(position)).getUserid()));
- }
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- this.currentUser.setCredit(this.currentUser.getCredit() - this.getTotal());
- this.currentUser.save();
- RestClient.getInstance().saveUserCredit(this.currentUser);
- this.clearCurrentUser();
- }
-
-*/
}
diff --git a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
index 1da4302..9724795 100644
--- a/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
+++ b/WarpDrinkApp/app/src/main/java/ms/warpzone/warppay/manager/MainManager.java
@@ -70,7 +70,7 @@ public class MainManager {
private RestService createRestService() {
Retrofit.Builder builder = new Retrofit.Builder()
- .baseUrl("https://infra-test.warpzone/api/")
+ .baseUrl("https://infra.warpzone/api/")
.addConverterFactory(GsonConverterFactory.create());
--
GitLab