From 682d1319436e35f7d650aaa99ca38fa12002bc3d Mon Sep 17 00:00:00 2001 From: Breno Rocha Date: Fri, 3 Aug 2018 20:54:49 -0300 Subject: [PATCH] Readiciona tela de login antiga temporariamente --- .../java/br/ufrj/caronae/acts/LoginAct.java | 21 +++++++++++++++++-- app/src/main/res/layout/activity_login.xml | 17 ++++++++++++++- app/src/main/res/values/strings.xml | 1 + 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/br/ufrj/caronae/acts/LoginAct.java b/app/src/main/java/br/ufrj/caronae/acts/LoginAct.java index 0c47fe97..7ad08307 100644 --- a/app/src/main/java/br/ufrj/caronae/acts/LoginAct.java +++ b/app/src/main/java/br/ufrj/caronae/acts/LoginAct.java @@ -40,6 +40,9 @@ public class LoginAct extends AppCompatActivity { @BindView(R.id.idUfrj_et) EditText idUfrj_et; + @BindView(R.id.key) + TextView getKey; + @BindView(R.id.send_bt) Button loginButton; @@ -62,8 +65,17 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_login); ButterKnife.bind(this); getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); - - if(!Constants.BUILD_TYPE.equals("prod")) + if(Constants.BUILD_TYPE.equals("prod")) + { + lBackV3.setVisibility(View.GONE); + rBackV3.setVisibility(View.GONE); + loginBtV3.setVisibility(View.GONE); + idUfrj_et.setVisibility(View.VISIBLE); + token_et.setVisibility(View.VISIBLE); + loginButton.setVisibility(View.VISIBLE); + getKey.setVisibility(View.VISIBLE); + } + else { lBackV3.setVisibility(View.GONE); rBackV3.setVisibility(View.GONE); @@ -213,4 +225,9 @@ public void loginV3() { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.API_BASE_URL + "login?type=app_jwt"))); } + + @OnClick(R.id.key) + public void getTokenBt() { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(CaronaeAPI.BASE_URL + "login"))); + } } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 8581c7a1..8664cd01 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -77,12 +77,27 @@ android:text="@string/welcome_message" android:textAppearance="?android:attr/textAppearanceMedium" /> + + RECADO DO MOTORISTA MOTIVO DO CONTATO PONTO DE REFERÊNCIA + OBTENHA SUA CHAVE AQUI Caronaê parou