diff --git a/org.envirocar.app/res/layout/layout_general_info_background.xml b/org.envirocar.app/res/layout/layout_general_info_background.xml index cc8604514..957250d3d 100644 --- a/org.envirocar.app/res/layout/layout_general_info_background.xml +++ b/org.envirocar.app/res/layout/layout_general_info_background.xml @@ -19,10 +19,10 @@ with the enviroCar app. If not, see http://www.gnu.org/licenses/. --> - + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + + + + diff --git a/org.envirocar.app/res/values/strings_fragment_dashboard.xml b/org.envirocar.app/res/values/strings_fragment_dashboard.xml index be754be59..146199f5d 100644 --- a/org.envirocar.app/res/values/strings_fragment_dashboard.xml +++ b/org.envirocar.app/res/values/strings_fragment_dashboard.xml @@ -19,11 +19,12 @@ with the enviroCar app. If not, see http://www.gnu.org/licenses/. --> - + OBD Track GPS Track START TRACK + Login/ Register Go to Track Recording Screen TRACK IS STARTING... TRACK IS STOPPING... diff --git a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java index 03081a1bf..2f5bf2360 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java +++ b/org.envirocar.app/src/org/envirocar/app/views/logbook/LogbookActivity.java @@ -30,6 +30,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; import android.view.View; import android.widget.AdapterView; @@ -40,6 +41,7 @@ import org.envirocar.app.BaseApplicationComponent; import org.envirocar.app.R; import org.envirocar.app.handler.preferences.CarPreferenceHandler; +import org.envirocar.app.views.login.SigninActivity; import org.envirocar.app.views.utils.ECAnimationUtils; import org.envirocar.core.ContextInternetAccessProvider; import org.envirocar.core.InternetAccessProvider; @@ -99,6 +101,8 @@ public class LogbookActivity extends BaseInjectorActivity implements LogbookUiLi protected TextView infoBackgroundFirst; @BindView(R.id.layout_general_info_background_secondline) protected TextView infoBackgroundSecond; + @BindView(R.id.logbook_login_register_button) + protected CardView logbookLoginRegisterButton; // @BindView(R.id.activity_logbook_not_logged_in) // protected View notLoggedInView; @@ -187,6 +191,11 @@ public void onBackPressed() { super.onBackPressed(); } + @OnClick(R.id.logbook_login_register_button) + protected void onClickLoginRegisterButton(){ + SigninActivity.startActivity(this); + } + @OnClick(R.id.activity_logbook_toolbar_new_fueling_fab) protected void onClickNewFuelingFAB() { if(carHandler.hasCars()) {