Commit 0bf59634 authored by Craig Earley's avatar Craig Earley
Browse files

applies Gradle updates, patches fonts on layout view of main screen

parent 9500ba8b
......@@ -64,7 +64,7 @@ android {
implementation 'com.google.android.gms:play-services-auth:17.0.0'
implementation 'com.google.android.gms:play-services-base:17.1.0'
implementation 'com.google.android.gms:play-services-basement:17.1.0'
implementation 'androidx.preference:preference:1.0.0'
implementation 'androidx.preference:preference:1.1.0'
}
productFlavors {
}
......
......@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
class AboutFragment extends Fragment {
public class AboutFragment extends Fragment {
public AboutFragment() {
// required empty constructor
......
......@@ -302,12 +302,8 @@ public class DatabaseActionsActivity extends AppCompatActivity {
"data in the current local database to an archive folder.");
break;
case R.id.wipeDatabase:
builder.setMessage("Wiping the database will store an archived copy. Are you sure?");
break;
case R.id.wipeReadingsTable:
builder.setMessage("Wiping the database will store an archived copy. Are you sure?");
break;
case R.id.wipeStreamingTable:
case R.id.wipeReadingsTable:
builder.setMessage("Wiping the database will store an archived copy. Are you sure?");
break;
}
......@@ -496,8 +492,6 @@ public class DatabaseActionsActivity extends AppCompatActivity {
break;
case ReadingsDatabase.VARCHAR:
case ReadingsDatabase.TEXT:
cv.put(column, rs.getString(column));
break;
case ReadingsDatabase.TIMESTAMP:
case ReadingsDatabase.TIMESTAMPTZ:
cv.put(column, rs.getString(column));
......
......@@ -9,7 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
class LabNotebookFragment extends Fragment {
public class LabNotebookFragment extends Fragment {
public LabNotebookFragment() {
// Required empty constructor
......
......@@ -9,7 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
class MainScreenFragment extends Fragment {
public class MainScreenFragment extends Fragment {
public MainScreenFragment () {
// empty constructor required
......
......@@ -12,7 +12,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager;
class SettingsFragment extends PreferenceFragmentCompat {
public class SettingsFragment extends PreferenceFragmentCompat {
static String shortDeviceID = (Build.SERIAL).substring((Build.SERIAL).length()-4);
private CheckBoxPreference writeWithoutGPS;
......
......@@ -16,6 +16,7 @@
app:srcCompat="@drawable/about_icon"
android:text="@string/about_text"
style="@style/miniButtons"
android:fontFamily="@font/comfortaaregular"
android:contentDescription="@string/aboutButtonMain"/>
<Button
android:id="@+id/buttonSettings"
......@@ -23,6 +24,7 @@
app:srcCompat="@drawable/settings_icon"
android:text="@string/settings_text"
style="@style/miniButtons"
android:fontFamily="@font/comfortaaregular"
android:contentDescription="@string/settingsButtonMain"/>
<Button
android:id="@+id/buttonNotebook"
......@@ -30,6 +32,7 @@
android:contentDescription="@string/labNotebookButtonMain"
app:srcCompat="@drawable/lab_notebook_icon"
style="@style/miniButtons"
android:fontFamily="@font/comfortaaregular"
android:text="@string/notebook_text"
/>
</LinearLayout>
......@@ -54,6 +57,7 @@
android:drawableTop="@drawable/bluetooth_devices"
android:contentDescription="@string/bluetoothSensor"
android:text="@string/bluetooth_devices_text"
android:fontFamily="@font/comfortaaregular"
android:onClick="startSampleActivity"/>
<Button
android:id="@+id/imageButtonBuiltIn"
......@@ -61,6 +65,7 @@
android:drawableTop="@drawable/builtin_sensors_icon"
android:contentDescription="@string/builtinSensors"
android:text="@string/builtin_sensors_text"
android:fontFamily="@font/comfortaaregular"
android:onClick="startSampleActivity" />
<Button
android:drawableTop="@drawable/bench_icon"
......@@ -68,6 +73,7 @@
android:id="@+id/imageButtonBenchSample"
style="@style/mainScreenButtons"
android:text="@string/bench_sample_text"
android:fontFamily="@font/comfortaaregular"
android:onClick="startSampleActivity" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.2'
classpath 'com.android.tools.build:gradle:3.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment