diff --git a/app/build.gradle b/app/build.gradle index d52d998..e1cfc8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } defaultConfig { - applicationId "com.wbrawner.myallowance" + applicationId "com.wbrawner.budget" minSdkVersion 23 targetSdkVersion 27 versionCode 1 diff --git a/app/src/androidTest/java/com/wbrawner/myallowance/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/wbrawner/budget/ExampleInstrumentedTest.kt similarity index 83% rename from app/src/androidTest/java/com/wbrawner/myallowance/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/wbrawner/budget/ExampleInstrumentedTest.kt index a5377fc..4337ab8 100644 --- a/app/src/androidTest/java/com/wbrawner/myallowance/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/wbrawner/budget/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance +package com.wbrawner.budget import android.support.test.InstrumentationRegistry import android.support.test.runner.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getTargetContext() - assertEquals("com.wbrawner.myallowance", appContext.packageName) + assertEquals("com.wbrawner.budget", appContext.packageName) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bbb6957..0e89ae7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,16 @@ + package="com.wbrawner.budget"> - + @@ -20,7 +20,7 @@ android:name="android.app.shortcuts" android:resource="@xml/shortcuts" /> - + \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/AllowanceApplication.kt b/app/src/main/java/com/wbrawner/budget/AllowanceApplication.kt similarity index 85% rename from app/src/main/java/com/wbrawner/myallowance/AllowanceApplication.kt rename to app/src/main/java/com/wbrawner/budget/AllowanceApplication.kt index dce7f4f..c0f379a 100644 --- a/app/src/main/java/com/wbrawner/myallowance/AllowanceApplication.kt +++ b/app/src/main/java/com/wbrawner/budget/AllowanceApplication.kt @@ -1,10 +1,11 @@ -package com.wbrawner.myallowance +package com.wbrawner.budget import android.app.Application import android.arch.persistence.room.Room import android.content.Context -import com.wbrawner.myallowance.data.TransactionDao -import com.wbrawner.myallowance.data.TransactionsDatabase +import com.wbrawner.budget.data.TransactionDao +import com.wbrawner.budget.data.TransactionsDatabase +import com.wbrawner.budget.BuildConfig import org.acra.ACRA import org.acra.annotation.AcraCore import org.acra.annotation.AcraHttpSender diff --git a/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionActivity.kt b/app/src/main/java/com/wbrawner/budget/addedittransaction/AddEditTransactionActivity.kt similarity index 93% rename from app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionActivity.kt rename to app/src/main/java/com/wbrawner/budget/addedittransaction/AddEditTransactionActivity.kt index 98731cd..99a008e 100644 --- a/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionActivity.kt +++ b/app/src/main/java/com/wbrawner/budget/addedittransaction/AddEditTransactionActivity.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.addedittransaction +package com.wbrawner.budget.addedittransaction import android.arch.lifecycle.Observer import android.arch.lifecycle.ViewModelProviders @@ -6,10 +6,10 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem -import com.wbrawner.myallowance.R -import com.wbrawner.myallowance.data.Transaction -import com.wbrawner.myallowance.data.TransactionType -import com.wbrawner.myallowance.transactions.TransactionViewModel +import com.wbrawner.budget.R +import com.wbrawner.budget.data.Transaction +import com.wbrawner.budget.data.TransactionType +import com.wbrawner.budget.transactions.TransactionViewModel import kotlinx.android.synthetic.main.activity_add_edit_transaction.* import java.util.* diff --git a/app/src/main/java/com/wbrawner/myallowance/data/Transaction.kt b/app/src/main/java/com/wbrawner/budget/data/Transaction.kt similarity index 89% rename from app/src/main/java/com/wbrawner/myallowance/data/Transaction.kt rename to app/src/main/java/com/wbrawner/budget/data/Transaction.kt index 25ead75..688af4d 100644 --- a/app/src/main/java/com/wbrawner/myallowance/data/Transaction.kt +++ b/app/src/main/java/com/wbrawner/budget/data/Transaction.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.data +package com.wbrawner.budget.data import android.arch.persistence.room.Entity import android.arch.persistence.room.PrimaryKey diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionDao.kt b/app/src/main/java/com/wbrawner/budget/data/TransactionDao.kt similarity index 96% rename from app/src/main/java/com/wbrawner/myallowance/data/TransactionDao.kt rename to app/src/main/java/com/wbrawner/budget/data/TransactionDao.kt index 511d398..3484722 100644 --- a/app/src/main/java/com/wbrawner/myallowance/data/TransactionDao.kt +++ b/app/src/main/java/com/wbrawner/budget/data/TransactionDao.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.data +package com.wbrawner.budget.data import android.arch.lifecycle.LiveData import android.arch.persistence.room.Dao diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionRepository.kt b/app/src/main/java/com/wbrawner/budget/data/TransactionRepository.kt similarity index 97% rename from app/src/main/java/com/wbrawner/myallowance/data/TransactionRepository.kt rename to app/src/main/java/com/wbrawner/budget/data/TransactionRepository.kt index 8e43232..30babaa 100644 --- a/app/src/main/java/com/wbrawner/myallowance/data/TransactionRepository.kt +++ b/app/src/main/java/com/wbrawner/budget/data/TransactionRepository.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.data +package com.wbrawner.budget.data import android.arch.lifecycle.LiveData import android.os.Handler diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionType.kt b/app/src/main/java/com/wbrawner/budget/data/TransactionType.kt similarity index 91% rename from app/src/main/java/com/wbrawner/myallowance/data/TransactionType.kt rename to app/src/main/java/com/wbrawner/budget/data/TransactionType.kt index f7c7272..ccc543b 100644 --- a/app/src/main/java/com/wbrawner/myallowance/data/TransactionType.kt +++ b/app/src/main/java/com/wbrawner/budget/data/TransactionType.kt @@ -1,8 +1,8 @@ -package com.wbrawner.myallowance.data +package com.wbrawner.budget.data import android.support.annotation.ColorRes import android.support.annotation.StringRes -import com.wbrawner.myallowance.R +import com.wbrawner.budget.R import java.io.Serializable enum class TransactionType( diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionsDatabase.kt b/app/src/main/java/com/wbrawner/budget/data/TransactionsDatabase.kt similarity index 91% rename from app/src/main/java/com/wbrawner/myallowance/data/TransactionsDatabase.kt rename to app/src/main/java/com/wbrawner/budget/data/TransactionsDatabase.kt index 5ef79c2..9df4892 100644 --- a/app/src/main/java/com/wbrawner/myallowance/data/TransactionsDatabase.kt +++ b/app/src/main/java/com/wbrawner/budget/data/TransactionsDatabase.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.data +package com.wbrawner.budget.data import android.arch.persistence.room.Database import android.arch.persistence.room.RoomDatabase diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TypeConverters.kt b/app/src/main/java/com/wbrawner/budget/data/TypeConverters.kt similarity index 95% rename from app/src/main/java/com/wbrawner/myallowance/data/TypeConverters.kt rename to app/src/main/java/com/wbrawner/budget/data/TypeConverters.kt index b3e70d2..8cbcc5b 100644 --- a/app/src/main/java/com/wbrawner/myallowance/data/TypeConverters.kt +++ b/app/src/main/java/com/wbrawner/budget/data/TypeConverters.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.data +package com.wbrawner.budget.data import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/wbrawner/myallowance/overview/OverviewFragment.kt b/app/src/main/java/com/wbrawner/budget/overview/OverviewFragment.kt similarity index 94% rename from app/src/main/java/com/wbrawner/myallowance/overview/OverviewFragment.kt rename to app/src/main/java/com/wbrawner/budget/overview/OverviewFragment.kt index f3c59fe..e8d2b2e 100644 --- a/app/src/main/java/com/wbrawner/myallowance/overview/OverviewFragment.kt +++ b/app/src/main/java/com/wbrawner/budget/overview/OverviewFragment.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.overview +package com.wbrawner.budget.overview import android.arch.lifecycle.Observer import android.arch.lifecycle.ViewModelProviders @@ -8,8 +8,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import com.wbrawner.myallowance.R -import com.wbrawner.myallowance.transactions.TransactionViewModel +import com.wbrawner.budget.R +import com.wbrawner.budget.transactions.TransactionViewModel class OverviewFragment : Fragment() { lateinit var viewModel: TransactionViewModel diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionAdapter.kt b/app/src/main/java/com/wbrawner/budget/transactions/TransactionAdapter.kt similarity index 86% rename from app/src/main/java/com/wbrawner/myallowance/transactions/TransactionAdapter.kt rename to app/src/main/java/com/wbrawner/budget/transactions/TransactionAdapter.kt index 49df7b4..fe5b416 100644 --- a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionAdapter.kt +++ b/app/src/main/java/com/wbrawner/budget/transactions/TransactionAdapter.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.transactions +package com.wbrawner.budget.transactions import android.content.Intent import android.support.v4.content.ContextCompat.startActivity @@ -7,10 +7,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import com.wbrawner.myallowance.R -import com.wbrawner.myallowance.addedittransaction.AddEditTransactionActivity -import com.wbrawner.myallowance.addedittransaction.AddEditTransactionActivity.Companion.EXTRA_TRANSACTION_ID -import com.wbrawner.myallowance.data.Transaction +import com.wbrawner.budget.R +import com.wbrawner.budget.addedittransaction.AddEditTransactionActivity +import com.wbrawner.budget.addedittransaction.AddEditTransactionActivity.Companion.EXTRA_TRANSACTION_ID +import com.wbrawner.budget.data.Transaction import java.text.SimpleDateFormat class TransactionAdapter(private val data: List) diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListActivity.kt b/app/src/main/java/com/wbrawner/budget/transactions/TransactionListActivity.kt similarity index 91% rename from app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListActivity.kt rename to app/src/main/java/com/wbrawner/budget/transactions/TransactionListActivity.kt index 439f758..d903aa7 100644 --- a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListActivity.kt +++ b/app/src/main/java/com/wbrawner/budget/transactions/TransactionListActivity.kt @@ -1,13 +1,13 @@ -package com.wbrawner.myallowance.transactions +package com.wbrawner.budget.transactions import android.os.Bundle import android.support.annotation.StringRes import android.support.text.emoji.EmojiCompat import android.support.text.emoji.bundled.BundledEmojiCompatConfig import android.support.v7.app.AppCompatActivity -import com.wbrawner.myallowance.R -import com.wbrawner.myallowance.data.TransactionType -import com.wbrawner.myallowance.overview.OverviewFragment +import com.wbrawner.budget.R +import com.wbrawner.budget.data.TransactionType +import com.wbrawner.budget.overview.OverviewFragment import kotlinx.android.synthetic.main.activity_transaction_list.* class TransactionListActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListFragment.kt b/app/src/main/java/com/wbrawner/budget/transactions/TransactionListFragment.kt similarity index 89% rename from app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListFragment.kt rename to app/src/main/java/com/wbrawner/budget/transactions/TransactionListFragment.kt index ea823ac..337fab8 100644 --- a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListFragment.kt +++ b/app/src/main/java/com/wbrawner/budget/transactions/TransactionListFragment.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance.transactions +package com.wbrawner.budget.transactions import android.arch.lifecycle.Observer import android.arch.lifecycle.ViewModelProviders @@ -12,11 +12,11 @@ import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.wbrawner.myallowance.R -import com.wbrawner.myallowance.addedittransaction.AddEditTransactionActivity -import com.wbrawner.myallowance.addedittransaction.AddEditTransactionActivity.Companion.EXTRA_TYPE -import com.wbrawner.myallowance.data.Transaction -import com.wbrawner.myallowance.data.TransactionType +import com.wbrawner.budget.R +import com.wbrawner.budget.addedittransaction.AddEditTransactionActivity +import com.wbrawner.budget.addedittransaction.AddEditTransactionActivity.Companion.EXTRA_TYPE +import com.wbrawner.budget.data.Transaction +import com.wbrawner.budget.data.TransactionType class TransactionListFragment : Fragment() { lateinit var viewModel: TransactionViewModel diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionViewModel.kt b/app/src/main/java/com/wbrawner/budget/transactions/TransactionViewModel.kt similarity index 79% rename from app/src/main/java/com/wbrawner/myallowance/transactions/TransactionViewModel.kt rename to app/src/main/java/com/wbrawner/budget/transactions/TransactionViewModel.kt index 52bd025..a3e02be 100644 --- a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionViewModel.kt +++ b/app/src/main/java/com/wbrawner/budget/transactions/TransactionViewModel.kt @@ -1,12 +1,12 @@ -package com.wbrawner.myallowance.transactions +package com.wbrawner.budget.transactions import android.app.Application import android.arch.lifecycle.AndroidViewModel import android.arch.lifecycle.LiveData -import com.wbrawner.myallowance.AllowanceApplication -import com.wbrawner.myallowance.data.Transaction -import com.wbrawner.myallowance.data.TransactionRepository -import com.wbrawner.myallowance.data.TransactionType +import com.wbrawner.budget.AllowanceApplication +import com.wbrawner.budget.data.Transaction +import com.wbrawner.budget.data.TransactionRepository +import com.wbrawner.budget.data.TransactionType class TransactionViewModel(application: Application): AndroidViewModel(application) { private val transactionRepo = TransactionRepository((application as AllowanceApplication).dao) diff --git a/app/src/main/res/layout/activity_transaction_list.xml b/app/src/main/res/layout/activity_transaction_list.xml index 7ff04c2..1d6b5ef 100644 --- a/app/src/main/res/layout/activity_transaction_list.xml +++ b/app/src/main/res/layout/activity_transaction_list.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".transactions.TransactionListActivity"> + tools:context="com.wbrawner.budget.transactions.TransactionListActivity"> + android:targetPackage="com.wbrawner.budget" + android:targetClass="com.wbrawner.budget.addedittransaction.AddEditTransactionActivity"> @@ -24,8 +24,8 @@ tools:ignore="UnusedAttribute"> + android:targetPackage="com.wbrawner.budget" + android:targetClass="com.wbrawner.budget.addedittransaction.AddEditTransactionActivity"> diff --git a/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt b/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt index 52bdaa8..d3f7c39 100644 --- a/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt +++ b/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.wbrawner.myallowance +package com.wbrawner.budget import org.junit.Test