mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-09-08 15:40:41 +02:00
Code Issues Releases Wiki Activity

Convert to using androidx instead of support library

Browse Source 
Since AndriodX is the new support library.
This commit is contained in:
Erik Johansson
2018-11-05 21:45:00 +01:00
parent b71bdb1730
commit 0b470cf9b9
34 changed files with 136 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
android_app/app/build.gradle
View File

@@ -15,7 +15,7 @@ android {
annotationProcessorOptions { arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] } annotationProcessorOptions { arguments = ["room.schemaLocation":"$projectDir/schemas".toString()] }
} }
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
sourceSets { sourceSets {
@@ -34,15 +34,11 @@ android {
} }
} }
ext {
supportLibVersion = '28.0.0'
}
dependencies { dependencies {
implementation "com.android.support:design:${supportLibVersion}" implementation 'com.google.android.material:material:1.1.0-alpha01'
implementation "com.android.support:support-v4:${supportLibVersion}" implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "com.android.support:appcompat-v7:${supportLibVersion}" implementation 'androidx.appcompat:appcompat:1.0.1'
implementation "com.android.support:recyclerview-v7:${supportLibVersion}" implementation 'androidx.recyclerview:recyclerview:1.0.0'
// HelloCharts // HelloCharts
implementation 'com.github.lecho:hellocharts-library:1.5.8@aar' implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
@@ -54,9 +50,9 @@ dependencies {
implementation 'cat.ereza:customactivityoncrash:2.2.0' implementation 'cat.ereza:customactivityoncrash:2.2.0'
// Room // Room
implementation 'android.arch.persistence.room:runtime:1.1.1' implementation 'androidx.room:room-runtime:2.1.0-alpha02'
annotationProcessor 'android.arch.persistence.room:compiler:1.1.1' annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha02'
androidTestImplementation 'android.arch.persistence.room:testing:1.1.1' androidTestImplementation 'androidx.room:room-testing:2.1.0-alpha02'
// Timber // Timber
implementation 'com.jakewharton.timber:timber:4.7.0' implementation 'com.jakewharton.timber:timber:4.7.0'
@@ -65,11 +61,11 @@ dependencies {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
// Instrumented unit tests // Instrumented unit tests
androidTestImplementation "com.android.support:support-annotations:${supportLibVersion}" androidTestImplementation 'androidx.annotation:annotation:1.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'com.android.support.test:rules:1.0.2' androidTestImplementation 'androidx.test:rules:1.1.0'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
} }
tasks.withType(Test) { tasks.withType(Test) {

10
android_app/app/src/androidTest/java/com/health/openscale/DatabaseMigrationTest.java
View File

@@ -16,14 +16,14 @@
package com.health.openscale; package com.health.openscale;
import android.arch.persistence.db.SupportSQLiteDatabase; import androidx.sqlite.db.SupportSQLiteDatabase;
import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory; import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
import android.arch.persistence.room.testing.MigrationTestHelper; import androidx.room.testing.MigrationTestHelper;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.health.openscale.core.database.AppDatabase; import com.health.openscale.core.database.AppDatabase;

6
android_app/app/src/androidTest/java/com/health/openscale/DatabaseTest.java
View File

@@ -15,10 +15,10 @@
*/ */
package com.health.openscale; package com.health.openscale;
import android.arch.persistence.room.Room; import androidx.room.Room;
import android.content.Context; import android.content.Context;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.health.openscale.core.database.AppDatabase; import com.health.openscale.core.database.AppDatabase;
import com.health.openscale.core.database.ScaleMeasurementDAO; import com.health.openscale.core.database.ScaleMeasurementDAO;

22
android_app/app/src/androidTest/java/com/health/openscale/gui/AddMeasurementTest.java
View File

@@ -18,11 +18,11 @@ package com.health.openscale.gui;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.espresso.contrib.PickerActions; import androidx.test.espresso.contrib.PickerActions;
import android.support.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import android.support.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import android.widget.DatePicker; import android.widget.DatePicker;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TimePicker; import android.widget.TimePicker;
@@ -63,12 +63,12 @@ import org.junit.runner.RunWith;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.replaceText; import static androidx.test.espresso.action.ViewActions.replaceText;
import static android.support.test.espresso.action.ViewActions.scrollTo; import static androidx.test.espresso.action.ViewActions.scrollTo;
import static android.support.test.espresso.matcher.ViewMatchers.withClassName; import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@LargeTest @LargeTest

26
android_app/app/src/androidTest/java/com/health/openscale/gui/AddUserTest.java
View File

@@ -18,12 +18,12 @@ package com.health.openscale.gui;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.espresso.ViewInteraction; import androidx.test.espresso.ViewInteraction;
import android.support.test.espresso.contrib.PickerActions; import androidx.test.espresso.contrib.PickerActions;
import android.support.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import android.support.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewParent; import android.view.ViewParent;
@@ -46,13 +46,13 @@ import org.junit.runner.RunWith;
import java.util.Calendar; import java.util.Calendar;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard; import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
import static android.support.test.espresso.action.ViewActions.replaceText; import static androidx.test.espresso.action.ViewActions.replaceText;
import static android.support.test.espresso.action.ViewActions.scrollTo; import static androidx.test.espresso.action.ViewActions.scrollTo;
import static android.support.test.espresso.matcher.ViewMatchers.withClassName; import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

34
android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
View File

@@ -20,14 +20,14 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
import android.support.test.rule.GrantPermissionRule; import androidx.test.rule.GrantPermissionRule;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import android.support.test.runner.screenshot.BasicScreenCaptureProcessor; import androidx.test.runner.screenshot.BasicScreenCaptureProcessor;
import android.support.test.runner.screenshot.ScreenCapture; import androidx.test.runner.screenshot.ScreenCapture;
import android.support.test.runner.screenshot.Screenshot; import androidx.test.runner.screenshot.Screenshot;
import android.support.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import android.view.Gravity; import android.view.Gravity;
import com.health.openscale.R; import com.health.openscale.R;
@@ -56,15 +56,15 @@ import timber.log.Timber;
import static android.os.Environment.DIRECTORY_PICTURES; import static android.os.Environment.DIRECTORY_PICTURES;
import static android.os.Environment.getExternalStoragePublicDirectory; import static android.os.Environment.getExternalStoragePublicDirectory;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.Espresso.pressBack; import static androidx.test.espresso.Espresso.pressBack;
import static android.support.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.contrib.DrawerActions.close; import static androidx.test.espresso.contrib.DrawerActions.close;
import static android.support.test.espresso.contrib.DrawerActions.open; import static androidx.test.espresso.contrib.DrawerActions.open;
import static android.support.test.espresso.contrib.DrawerMatchers.isClosed; import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
import static android.support.test.espresso.contrib.NavigationViewActions.navigateTo; import static androidx.test.espresso.contrib.NavigationViewActions.navigateTo;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
@LargeTest @LargeTest
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)

2
android_app/app/src/main/AndroidManifest.xml
View File

@@ -60,7 +60,7 @@
</activity> </activity>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider" android:authorities="${applicationId}.fileprovider"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:exported="false"> android:exported="false">

8
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -17,9 +17,9 @@
package com.health.openscale.core; package com.health.openscale.core;
import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetManager;
import android.arch.persistence.db.SupportSQLiteDatabase; import androidx.sqlite.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Room; import androidx.room.Room;
import android.arch.persistence.room.RoomDatabase; import androidx.room.RoomDatabase;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -30,7 +30,7 @@ import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.widget.Toast; import android.widget.Toast;

2
android_app/app/src/main/java/com/health/openscale/core/alarm/AlarmHandler.java
View File

@@ -23,7 +23,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.service.notification.StatusBarNotification; import android.service.notification.StatusBarNotification;
import android.support.v4.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import com.health.openscale.R; import com.health.openscale.R;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -31,7 +31,7 @@ import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothTrisaBodyAnalyze.java
View File

@@ -20,7 +20,7 @@ import android.bluetooth.BluetoothGattCharacteristic;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import com.health.openscale.R; import com.health.openscale.R;
import com.health.openscale.core.OpenScale; import com.health.openscale.core.OpenScale;

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/lib/TrisaBodyAnalyzeLib.java
View File

@@ -15,7 +15,7 @@
*/ */
package com.health.openscale.core.bluetooth.lib; package com.health.openscale.core.bluetooth.lib;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;

10
android_app/app/src/main/java/com/health/openscale/core/database/AppDatabase.java
View File

@@ -16,11 +16,11 @@
package com.health.openscale.core.database; package com.health.openscale.core.database;
import android.arch.persistence.db.SupportSQLiteDatabase; import androidx.sqlite.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Database; import androidx.room.Database;
import android.arch.persistence.room.RoomDatabase; import androidx.room.RoomDatabase;
import android.arch.persistence.room.TypeConverters; import androidx.room.TypeConverters;
import android.arch.persistence.room.migration.Migration; import androidx.room.migration.Migration;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;

10
android_app/app/src/main/java/com/health/openscale/core/database/ScaleMeasurementDAO.java
View File

@@ -16,11 +16,11 @@
package com.health.openscale.core.database; package com.health.openscale.core.database;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import android.arch.persistence.room.Update; import androidx.room.Update;
import android.database.Cursor; import android.database.Cursor;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;

10
android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDAO.java
View File

@@ -16,11 +16,11 @@
package com.health.openscale.core.database; package com.health.openscale.core.database;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Delete; import androidx.room.Delete;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.Query; import androidx.room.Query;
import android.arch.persistence.room.Update; import androidx.room.Update;
import android.database.Cursor; import android.database.Cursor;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;

10
android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
View File

@@ -16,11 +16,11 @@
package com.health.openscale.core.datatypes; package com.health.openscale.core.datatypes;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import com.j256.simplecsv.common.CsvColumn; import com.j256.simplecsv.common.CsvColumn;

8
android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleUser.java
View File

@@ -16,10 +16,10 @@
package com.health.openscale.core.datatypes; package com.health.openscale.core.datatypes;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import com.health.openscale.core.utils.Converters; import com.health.openscale.core.utils.Converters;
import com.health.openscale.core.utils.DateTimeHelpers; import com.health.openscale.core.utils.DateTimeHelpers;

2
android_app/app/src/main/java/com/health/openscale/core/utils/Converters.java
View File

@@ -16,7 +16,7 @@
package com.health.openscale.core.utils; package com.health.openscale.core.utils;
import android.arch.persistence.room.TypeConverter; import androidx.room.TypeConverter;
import java.util.Date; import java.util.Date;

22
android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
View File

@@ -29,17 +29,17 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.design.widget.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import android.support.design.widget.NavigationView; import com.google.android.material.navigation.NavigationView;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import android.support.v4.content.FileProvider; import androidx.core.content.FileProvider;
import android.support.v4.view.GravityCompat; import androidx.core.view.GravityCompat;
import android.support.v4.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import androidx.appcompat.app.ActionBarDrawerToggle;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast; import android.widget.Toast;

2
android_app/app/src/main/java/com/health/openscale/gui/activities/BaseAppCompatActivity.java
View File

@@ -21,7 +21,7 @@ import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils; import android.text.TextUtils;
import com.health.openscale.R; import com.health.openscale.R;

4
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

@@ -23,8 +23,8 @@ import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.graphics.drawable.DrawableCompat; import androidx.core.graphics.drawable.DrawableCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;

4
android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
View File

@@ -23,8 +23,8 @@ import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.graphics.drawable.DrawableCompat; import androidx.core.graphics.drawable.DrawableCompat;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;

6
android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java
View File

@@ -23,8 +23,8 @@ import android.graphics.Color;
import android.graphics.DashPathEffect; import android.graphics.DashPathEffect;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@@ -257,7 +257,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
actionButton.setColorFilter(Color.parseColor("#000000")); actionButton.setColorFilter(Color.parseColor("#000000"));
actionButton.setImageDrawable(measurementView.getIcon()); actionButton.setImageDrawable(measurementView.getIcon());
actionButton.setClickable(true); actionButton.setClickable(true);
actionButton.setSize(android.support.design.widget.FloatingActionButton.SIZE_MINI); actionButton.setSize(FloatingActionButton.SIZE_MINI);
RelativeLayout.LayoutParams lay = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); RelativeLayout.LayoutParams lay = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
lay.setMargins(0,5,20,10); lay.setMargins(0,5,20,10);
actionButton.setLayoutParams(lay); actionButton.setLayoutParams(lay);

2
android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
View File

@@ -21,7 +21,7 @@ import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

2
android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java
View File

@@ -18,7 +18,7 @@ package com.health.openscale.gui.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.text.Html; import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

8
android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
View File

@@ -18,10 +18,10 @@ package com.health.openscale.gui.fragments;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.widget.DividerItemDecoration; import androidx.recyclerview.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;

2
android_app/app/src/main/java/com/health/openscale/gui/utils/PermissionHelper.java
View File

@@ -25,7 +25,7 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.widget.Toast; import android.widget.Toast;
import com.health.openscale.R; import com.health.openscale.R;

2
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
View File

@@ -25,7 +25,7 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.TypedValue; import android.util.TypedValue;

2
android_app/app/src/main/res/layout/activity_dataentry.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/dataEntryToolbar" android:id="@+id/dataEntryToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"

12
android_app/app/src/main/res/layout/activity_main.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.v4.widget.DrawerLayout <androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@@ -18,7 +18,7 @@
android:orientation="vertical"> android:orientation="vertical">
<!-- The ActionBar displayed at the top --> <!-- The ActionBar displayed at the top -->
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:background="?attr/colorPrimaryDark"> android:background="?attr/colorPrimaryDark">
</android.support.v7.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<!-- action_menumain content view where fragments are loaded --> <!-- action_menumain content view where fragments are loaded -->
@@ -37,7 +37,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="90"/> android:layout_weight="90"/>
<android.support.design.widget.BottomNavigationView <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation_bottom_view" android:id="@+id/navigation_bottom_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
<!-- The navigation drawer that comes from the left --> <!-- The navigation drawer that comes from the left -->
<!-- Note that `android:layout_gravity` needs to be set to 'start' --> <!-- Note that `android:layout_gravity` needs to be set to 'start' -->
<android.support.design.widget.NavigationView <com.google.android.material.navigation.NavigationView
android:id="@+id/navigation_view" android:id="@+id/navigation_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -58,5 +58,5 @@
app:headerLayout="@layout/drawer_header" app:headerLayout="@layout/drawer_header"
app:menu="@menu/drawer_view" /> app:menu="@menu/drawer_view" />
</android.support.v4.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>
</RelativeLayout> </RelativeLayout>

2
android_app/app/src/main/res/layout/activity_usersettings.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/userEntryToolbar" android:id="@+id/userEntryToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"

4
android_app/app/src/main/res/layout/fragment_overview.xml
View File

@@ -1,4 +1,4 @@
<android.support.design.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@@ -86,4 +86,4 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</android.support.design.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

2
android_app/app/src/main/res/layout/fragment_table.xml
View File

@@ -16,7 +16,7 @@
android:layout_height="2dp" android:layout_height="2dp"
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider" />
<android.support.v7.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/tableDataView" android:id="@+id/tableDataView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
android_app/gradle.properties Normal file
View File

@@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true