From 7714f31f57f3fbd62c2f598d997ddb03d3daeeb4 Mon Sep 17 00:00:00 2001 From: Matthes Rieke Date: Mon, 24 Jan 2022 10:53:08 +0100 Subject: [PATCH 1/5] update vesion number to 52 --- build.gradle | 2 +- org.envirocar.app/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 139b96c24..d2043fdb1 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ ext { compileSdkVersion = 31 targetSdkVersion = 31 buildToolsVersion = '30.0.2' - versionCode = 51 + versionCode = 52 versionName = "2.1.0" ndkVersion = "21.4.7075529" diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml index a67fbfcf6..07dcbeeaa 100644 --- a/org.envirocar.app/AndroidManifest.xml +++ b/org.envirocar.app/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="org.envirocar.app" android:installLocation="internalOnly" - android:versionCode="51" + android:versionCode="52" android:versionName="2.1.0" > From cb17197c5bf8714ca61f44d581f9a049da66cbf4 Mon Sep 17 00:00:00 2001 From: Sebastian Drost Date: Thu, 21 Apr 2022 09:21:02 +0200 Subject: [PATCH 2/5] Update version number to 53 --- build.gradle | 2 +- org.envirocar.app/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d2043fdb1..fa40cad96 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ ext { compileSdkVersion = 31 targetSdkVersion = 31 buildToolsVersion = '30.0.2' - versionCode = 52 + versionCode = 53 versionName = "2.1.0" ndkVersion = "21.4.7075529" diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml index 7921b60f6..f3d3141eb 100644 --- a/org.envirocar.app/AndroidManifest.xml +++ b/org.envirocar.app/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="org.envirocar.app" android:installLocation="internalOnly" - android:versionCode="52" + android:versionCode="53" android:versionName="2.1.0" > From 9f35ad785b93322dfcc4fa6a52e35c73892372ea Mon Sep 17 00:00:00 2001 From: Sebastian Drost Date: Thu, 21 Apr 2022 09:32:07 +0200 Subject: [PATCH 3/5] Set API URL to stable --- .../java/org/envirocar/remote/service/EnviroCarService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 6cd20da2ba61b31b42352c7e7fc817e4fb616f25 Mon Sep 17 00:00:00 2001 From: Sebastian Drost Date: Thu, 21 Apr 2022 09:59:49 +0200 Subject: [PATCH 4/5] Raise version name --- build.gradle | 2 +- org.envirocar.app/AndroidManifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fa40cad96..77055883f 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ ext { targetSdkVersion = 31 buildToolsVersion = '30.0.2' versionCode = 53 - versionName = "2.1.0" + versionName = "2.1.1" ndkVersion = "21.4.7075529" javaCompileVersion = JavaVersion.VERSION_1_8 diff --git a/org.envirocar.app/AndroidManifest.xml b/org.envirocar.app/AndroidManifest.xml index f3d3141eb..10e5591a7 100644 --- a/org.envirocar.app/AndroidManifest.xml +++ b/org.envirocar.app/AndroidManifest.xml @@ -4,7 +4,7 @@ package="org.envirocar.app" android:installLocation="internalOnly" android:versionCode="53" - android:versionName="2.1.0" + android:versionName="2.1.1" > From 4854a8a7ef978721fb1caefa81e6a08624954b0b Mon Sep 17 00:00:00 2001 From: Akash-Ramjyothi Date: Mon, 27 Jun 2022 14:32:34 +0530 Subject: [PATCH 5/5] Added FAB scroll --- .../res/drawable/ic_scroll_up.xml | 6 ++++++ .../res/layout/activity_help_layout.xml | 13 ++++++++++++ .../app/views/others/HelpActivity.java | 20 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 org.envirocar.app/res/drawable/ic_scroll_up.xml 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);