diff --git a/README.md b/README.md index c3879e4..d7cb29a 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,7 @@ - [ ] Units for kg/lbs - [ ] CSV importing and exporting - [ ] Setting goal weight (adds a horizontal flat line to chart) +- [ ] Make the chart on vertical view a 30-day view, and then a little expand button at the top can expand it to see lifetime history +- [ ] Homescreen widget for quick entry of weight +- [ ] Google assistant action for quick entry of weight +- [ ] Opt-in cloud back-up diff --git a/app/build.gradle b/app/build.gradle index be1dff0..b95431e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,18 +1,14 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - +apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' - apply plugin: "androidx.navigation.safeargs.kotlin" -apply plugin: 'kotlin-kapt' - android { compileSdkVersion 29 buildToolsVersion "29.0.2" defaultConfig { - applicationId "com.example.weighttracker" + applicationId "com.brian.weightless" minSdkVersion 26 targetSdkVersion 29 versionCode 1 diff --git a/app/release/app-release.aab b/app/release/app-release.aab new file mode 100644 index 0000000..a7e3b76 Binary files /dev/null and b/app/release/app-release.aab differ diff --git a/app/src/androidTest/java/com/example/weighttracker/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/brian/weightLess/ExampleInstrumentedTest.kt similarity index 94% rename from app/src/androidTest/java/com/example/weighttracker/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/brian/weightLess/ExampleInstrumentedTest.kt index 932a957..bb34f79 100644 --- a/app/src/androidTest/java/com/example/weighttracker/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/brian/weightLess/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker +package com.brian.weightLess import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 38699e0..2aeee70 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.brian.weightLess"> - + diff --git a/app/src/main/java/com/example/weighttracker/ChartAdapter.kt b/app/src/main/java/com/brian/weightLess/ChartAdapter.kt similarity index 91% rename from app/src/main/java/com/example/weighttracker/ChartAdapter.kt rename to app/src/main/java/com/brian/weightLess/ChartAdapter.kt index 7ad6a33..3f65002 100644 --- a/app/src/main/java/com/example/weighttracker/ChartAdapter.kt +++ b/app/src/main/java/com/brian/weightLess/ChartAdapter.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker +package com.brian.weightLess import com.robinhood.spark.SparkAdapter diff --git a/app/src/main/java/com/example/weighttracker/MainActivity.kt b/app/src/main/java/com/brian/weightLess/MainActivity.kt similarity index 91% rename from app/src/main/java/com/example/weighttracker/MainActivity.kt rename to app/src/main/java/com/brian/weightLess/MainActivity.kt index 5ac3ac7..bc32364 100644 --- a/app/src/main/java/com/example/weighttracker/MainActivity.kt +++ b/app/src/main/java/com/brian/weightLess/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker +package com.brian.weightLess import android.os.Bundle import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/com/example/weighttracker/MainFragment.kt b/app/src/main/java/com/brian/weightLess/MainFragment.kt similarity index 97% rename from app/src/main/java/com/example/weighttracker/MainFragment.kt rename to app/src/main/java/com/brian/weightLess/MainFragment.kt index b79fd30..561642c 100644 --- a/app/src/main/java/com/example/weighttracker/MainFragment.kt +++ b/app/src/main/java/com/brian/weightLess/MainFragment.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker +package com.brian.weightLess import android.graphics.Color import android.os.Bundle @@ -12,8 +12,8 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.example.weighttracker.data.AppDatabase -import com.example.weighttracker.data.WeightEntity +import com.brian.weightLess.data.AppDatabase +import com.brian.weightLess.data.WeightEntity import com.google.android.material.snackbar.Snackbar import kotlinx.android.synthetic.main.main_fragment.* diff --git a/app/src/main/java/com/example/weighttracker/MainViewModel.kt b/app/src/main/java/com/brian/weightLess/MainViewModel.kt similarity index 87% rename from app/src/main/java/com/example/weighttracker/MainViewModel.kt rename to app/src/main/java/com/brian/weightLess/MainViewModel.kt index 72216b4..4f66310 100644 --- a/app/src/main/java/com/example/weighttracker/MainViewModel.kt +++ b/app/src/main/java/com/brian/weightLess/MainViewModel.kt @@ -1,8 +1,8 @@ -package com.example.weighttracker +package com.brian.weightLess import androidx.lifecycle.* -import com.example.weighttracker.data.WeightDao -import com.example.weighttracker.data.WeightEntity +import com.brian.weightLess.data.WeightDao +import com.brian.weightLess.data.WeightEntity import kotlinx.coroutines.launch class MainViewModel(private val weightDao: WeightDao) : ViewModelProvider.Factory, ViewModel() { diff --git a/app/src/main/java/com/example/weighttracker/SwipeToDeleteCallback.kt b/app/src/main/java/com/brian/weightLess/SwipeToDeleteCallback.kt similarity index 98% rename from app/src/main/java/com/example/weighttracker/SwipeToDeleteCallback.kt rename to app/src/main/java/com/brian/weightLess/SwipeToDeleteCallback.kt index 55465eb..9632b5b 100644 --- a/app/src/main/java/com/example/weighttracker/SwipeToDeleteCallback.kt +++ b/app/src/main/java/com/brian/weightLess/SwipeToDeleteCallback.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker +package com.brian.weightLess import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/com/example/weighttracker/WeightAdapter.kt b/app/src/main/java/com/brian/weightLess/WeightAdapter.kt similarity index 94% rename from app/src/main/java/com/example/weighttracker/WeightAdapter.kt rename to app/src/main/java/com/brian/weightLess/WeightAdapter.kt index 11cb65d..705d2fa 100644 --- a/app/src/main/java/com/example/weighttracker/WeightAdapter.kt +++ b/app/src/main/java/com/brian/weightLess/WeightAdapter.kt @@ -1,11 +1,11 @@ -package com.example.weighttracker +package com.brian.weightLess import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView import androidx.cardview.widget.CardView import androidx.recyclerview.widget.RecyclerView -import com.example.weighttracker.data.WeightEntity +import com.brian.weightLess.data.WeightEntity import kotlinx.android.synthetic.main.item_weight_entry.view.* import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/example/weighttracker/WeightDialogFragment.kt b/app/src/main/java/com/brian/weightLess/WeightDialogFragment.kt similarity index 98% rename from app/src/main/java/com/example/weighttracker/WeightDialogFragment.kt rename to app/src/main/java/com/brian/weightLess/WeightDialogFragment.kt index 5966627..e86b373 100644 --- a/app/src/main/java/com/example/weighttracker/WeightDialogFragment.kt +++ b/app/src/main/java/com/brian/weightLess/WeightDialogFragment.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker +package com.brian.weightLess import android.app.DatePickerDialog import android.os.Bundle @@ -8,7 +8,7 @@ import android.view.ViewGroup import androidx.fragment.app.DialogFragment import androidx.lifecycle.ViewModelProviders import androidx.navigation.fragment.navArgs -import com.example.weighttracker.data.WeightEntity +import com.brian.weightLess.data.WeightEntity import com.google.android.material.textfield.TextInputEditText import kotlinx.android.synthetic.main.dialog_weight_fragment.* import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/example/weighttracker/WeightDialogSharedViewModel.kt b/app/src/main/java/com/brian/weightLess/WeightDialogSharedViewModel.kt similarity index 90% rename from app/src/main/java/com/example/weighttracker/WeightDialogSharedViewModel.kt rename to app/src/main/java/com/brian/weightLess/WeightDialogSharedViewModel.kt index 9449a0f..c84daca 100644 --- a/app/src/main/java/com/example/weighttracker/WeightDialogSharedViewModel.kt +++ b/app/src/main/java/com/brian/weightLess/WeightDialogSharedViewModel.kt @@ -1,9 +1,9 @@ -package com.example.weighttracker +package com.brian.weightLess import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.example.weighttracker.data.WeightEntity +import com.brian.weightLess.data.WeightEntity class WeightDialogSharedViewModel : ViewModel() { diff --git a/app/src/main/java/com/example/weighttracker/data/AppDatabase.kt b/app/src/main/java/com/brian/weightLess/data/AppDatabase.kt similarity index 95% rename from app/src/main/java/com/example/weighttracker/data/AppDatabase.kt rename to app/src/main/java/com/brian/weightLess/data/AppDatabase.kt index ea1f6cb..37926d9 100644 --- a/app/src/main/java/com/example/weighttracker/data/AppDatabase.kt +++ b/app/src/main/java/com/brian/weightLess/data/AppDatabase.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker.data +package com.brian.weightLess.data import android.content.Context import androidx.room.Database diff --git a/app/src/main/java/com/example/weighttracker/data/WeightDao.kt b/app/src/main/java/com/brian/weightLess/data/WeightDao.kt similarity index 90% rename from app/src/main/java/com/example/weighttracker/data/WeightDao.kt rename to app/src/main/java/com/brian/weightLess/data/WeightDao.kt index 331413c..57fe446 100644 --- a/app/src/main/java/com/example/weighttracker/data/WeightDao.kt +++ b/app/src/main/java/com/brian/weightLess/data/WeightDao.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker.data +package com.brian.weightLess.data import androidx.room.* import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/example/weighttracker/data/WeightEntity.kt b/app/src/main/java/com/brian/weightLess/data/WeightEntity.kt similarity index 84% rename from app/src/main/java/com/example/weighttracker/data/WeightEntity.kt rename to app/src/main/java/com/brian/weightLess/data/WeightEntity.kt index a71990f..921c5f3 100644 --- a/app/src/main/java/com/example/weighttracker/data/WeightEntity.kt +++ b/app/src/main/java/com/brian/weightLess/data/WeightEntity.kt @@ -1,4 +1,4 @@ -package com.example.weighttracker.data +package com.brian.weightLess.data import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 990a4e5..2ddf852 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,7 +7,7 @@