diff --git a/org.envirocar.app/res/drawable/ic_scroll_up.xml b/org.envirocar.app/res/drawable/ic_scroll_up.xml new file mode 100644 index 000000000..b32d44538 --- /dev/null +++ b/org.envirocar.app/res/drawable/ic_scroll_up.xml @@ -0,0 +1,6 @@ + + + diff --git a/org.envirocar.app/res/layout/activity_help_layout.xml b/org.envirocar.app/res/layout/activity_help_layout.xml index 6d935c461..74375df72 100644 --- a/org.envirocar.app/res/layout/activity_help_layout.xml +++ b/org.envirocar.app/res/layout/activity_help_layout.xml @@ -22,6 +22,7 @@ + + + \ No newline at end of file diff --git a/org.envirocar.app/src/org/envirocar/app/views/others/HelpActivity.java b/org.envirocar.app/src/org/envirocar/app/views/others/HelpActivity.java index 2f64c3728..3c311c5d6 100644 --- a/org.envirocar.app/src/org/envirocar/app/views/others/HelpActivity.java +++ b/org.envirocar.app/src/org/envirocar/app/views/others/HelpActivity.java @@ -21,7 +21,13 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import androidx.core.widget.NestedScrollView; + import android.view.MenuItem; +import android.view.View; +import android.widget.ScrollView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; import org.envirocar.app.R; @@ -38,12 +44,26 @@ public class HelpActivity extends AppCompatActivity { @BindView(R.id.activity_help_layout_general_toolbar) protected Toolbar toolbar; + NestedScrollView nestedScrollView; + FloatingActionButton floatingActionButton; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_help_layout_general); + nestedScrollView = findViewById(R.id.helpScroll); + floatingActionButton = findViewById(R.id.topScroll); + + floatingActionButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + nestedScrollView.fullScroll(NestedScrollView.FOCUS_UP); + floatingActionButton.show(); + } + }); + // Inject views ButterKnife.bind(this); diff --git a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/EnviroCarService.java b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/EnviroCarService.java index 3e763cdf2..6ccbe582c 100644 --- a/org.envirocar.remote/src/main/java/org/envirocar/remote/service/EnviroCarService.java +++ b/org.envirocar.remote/src/main/java/org/envirocar/remote/service/EnviroCarService.java @@ -23,7 +23,7 @@ * @author dewall */ public class EnviroCarService { - public static final String BASE_URL = "https://envirocar.org/api/dev/"; + public static final String BASE_URL = "https://envirocar.org/api/stable/"; protected static UserService userService;