auto switche user to settings pg if no record made

qumquat-eater · Mar 1, 2021 · d35a099 · d35a099
1 parent 939f9a9
commit d35a099
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 4 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/SDP2021Robopump.iml b/.idea/SDP2021Robopump.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Robopump2/.idea/runConfigurations.xml b/Robopump2/.idea/runConfigurations.xml
diff --git a/Robopump2/app/src/main/java/com/example/robopump2/MainActivity.java b/Robopump2/app/src/main/java/com/example/robopump2/MainActivity.java
@@ -133,6 +133,13 @@ public void onStopTrackingTouch(SeekBar seekBar) {
             fuelButtons.get(i).setAlpha(sharedPreferences.getFloat((String) fuelButtons.get(i).getText(),1));
         }
 
+        // if no user data found automatically switch user to settings page
+        DatabaseReader x = new DatabaseReader();
+        if (x.numberOfRecords(getApplicationContext()) < 2){
+            Intent intent = new Intent(this, SettingsActivity.class);
+            startActivity(intent);
+        }
+
     }
 
     //opens the settings page

diff --git a/Robopump2/app/src/main/java/com/example/robopump2/SettingsActivity.java b/Robopump2/app/src/main/java/com/example/robopump2/SettingsActivity.java
@@ -55,7 +55,11 @@ protected void onCreate(Bundle savedInstanceState) {
         returnButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                returnToMainPage();
+                if (numberOfRecords() < 2) {
+                    Toast.makeText(getApplicationContext(), "Must create a user", Toast.LENGTH_SHORT).show();
+                } else {
+                    returnToMainPage();
+                }
             }
         });
 

diff --git a/Robopump2/build.gradle b/Robopump2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-beta04'
+        classpath 'com.android.tools.build:gradle:4.2.0-beta05'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Robopump2/gradle/wrapper/gradle-wrapper.properties b/Robopump2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 02 12:19:39 GMT 2021
+#Sat Feb 27 17:56:44 GMT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip