commit 36ed88a54c182d115a6129736a8259f4f6e83eee Author: Billy Brawner Date: Tue Jul 31 21:01:15 2018 -0500 Initial commit with basic income/expense adding/persistence diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cc652f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild +*.log +.idea/ +*~ diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..c31f073 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,47 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-kapt' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + + +android { + compileSdkVersion 27 + defaultConfig { + applicationId "com.wbrawner.myallowance" + minSdkVersion 23 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + vectorDrawables { + useSupportLibrary = true + } + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support:design:27.1.1' + def room_version = "1.1.1" + def lifecycle_version = "1.1.1" + // ViewModel and LiveData + implementation "android.arch.lifecycle:extensions:$lifecycle_version" + implementation "android.arch.persistence.room:runtime:$room_version" + kapt "android.arch.persistence.room:compiler:$room_version" + testImplementation "android.arch.persistence.room:testing:$room_version" + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/wbrawner/myallowance/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/wbrawner/myallowance/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..a5377fc --- /dev/null +++ b/app/src/androidTest/java/com/wbrawner/myallowance/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.wbrawner.myallowance + +import android.support.test.InstrumentationRegistry +import android.support.test.runner.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getTargetContext() + assertEquals("com.wbrawner.myallowance", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8e5da0f --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + \ 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/myallowance/AllowanceApplication.kt new file mode 100644 index 0000000..0cc4c5a --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/AllowanceApplication.kt @@ -0,0 +1,25 @@ +package com.wbrawner.myallowance + +import android.app.Application +import android.arch.lifecycle.ViewModelProvider +import android.arch.persistence.room.Room +import android.arch.persistence.room.Transaction +import com.wbrawner.myallowance.data.TransactionDao +import com.wbrawner.myallowance.data.TransactionsDatabase + +class AllowanceApplication: Application() { + lateinit var database: TransactionsDatabase + private set + + lateinit var dao: TransactionDao + private set + + override fun onCreate() { + super.onCreate() + + database = Room.databaseBuilder(applicationContext, TransactionsDatabase::class.java, "transactions") + .build() + dao = database.dao() + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionActivity.kt b/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionActivity.kt new file mode 100644 index 0000000..550fe5a --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionActivity.kt @@ -0,0 +1,62 @@ +package com.wbrawner.myallowance.addedittransaction + +import android.arch.lifecycle.ViewModelProviders +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +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 kotlinx.android.synthetic.main.activity_add_edit_transaction.* +import java.util.* + +class AddEditTransactionActivity : AppCompatActivity() { + lateinit var viewModel: TransactionViewModel + lateinit var type: TransactionType + var date: Date = Date() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_add_edit_transaction) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + viewModel = ViewModelProviders.of(this).get(TransactionViewModel::class.java) + type = TransactionType.valueOf(intent?.extras?.getString(EXTRA_TYPE, "EXPENSE")?: "EXPENSE") + setTitle(type.addTitle) + } + + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + menuInflater.inflate(R.menu.menu_add_edit, menu) + return true + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + when (item?.itemId) { + android.R.id.home -> onBackPressed() + R.id.action_save -> { + val field = edit_transaction_date + val cal = Calendar.getInstance() + cal.set(field.year, field.month, field.dayOfMonth) + + viewModel.saveTransaction(Transaction( + id = null, + title = edit_transaction_title.text.toString(), + date = cal.time, + description = edit_transaction_description.text.toString(), + amount = edit_transaction_amount.text.toString().toDouble(), + type = type + )) + finish() + } + } + return true + } + + + companion object { + const val EXTRA_TYPE = "EXTRA_TRANSACTION_TYPE" + const val EXTRA_TRANSACTION_ID = "EXTRA_TRANSACTION_ID" + } +} diff --git a/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionDialog.kt b/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionDialog.kt new file mode 100644 index 0000000..ac75a0f --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/addedittransaction/AddEditTransactionDialog.kt @@ -0,0 +1,8 @@ +package com.wbrawner.myallowance.addedittransaction + +import android.content.Context +import android.support.v7.app.AlertDialog + +class AddEditTransactionDialog(context: Context) : AlertDialog(context) { + +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/data/Transaction.kt b/app/src/main/java/com/wbrawner/myallowance/data/Transaction.kt new file mode 100644 index 0000000..25ead75 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/data/Transaction.kt @@ -0,0 +1,16 @@ +package com.wbrawner.myallowance.data + +import android.arch.persistence.room.Entity +import android.arch.persistence.room.PrimaryKey +import java.util.* + +@Entity +class Transaction( + @PrimaryKey + val id: Int?, + val title: String, + val date: Date, + val description: String, + val amount: Double, + val type: TransactionType +) \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionDao.kt b/app/src/main/java/com/wbrawner/myallowance/data/TransactionDao.kt new file mode 100644 index 0000000..e244a1b --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/data/TransactionDao.kt @@ -0,0 +1,25 @@ +package com.wbrawner.myallowance.data + +import android.arch.lifecycle.LiveData +import android.arch.persistence.room.Dao +import android.arch.persistence.room.Insert +import android.arch.persistence.room.OnConflictStrategy.REPLACE +import android.arch.persistence.room.Query + +@Dao +interface TransactionDao { + @Insert(onConflict = REPLACE) + fun save(transaction: Transaction) + + @Query("SELECT * FROM `Transaction` WHERE id = :id") + fun load(id: Int): LiveData + + @Query("SELECT * FROM `Transaction` LIMIT :count") + fun loadMultiple(count: Int): LiveData> + + @Query("SELECT * FROM `Transaction` WHERE type = :type LIMIT :count") + fun loadMultipleByType(count: Int, type: TransactionType): LiveData> + + @Query("SELECT (SELECT TOTAL(amount) from `Transaction` WHERE type = 'INCOME') - (SELECT TOTAL(amount) from `Transaction` WHERE type = 'EXPENSE')") + fun getBalance(): LiveData +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionRepository.kt b/app/src/main/java/com/wbrawner/myallowance/data/TransactionRepository.kt new file mode 100644 index 0000000..363bed4 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/data/TransactionRepository.kt @@ -0,0 +1,57 @@ +package com.wbrawner.myallowance.data + +import android.arch.lifecycle.LiveData +import android.arch.lifecycle.MutableLiveData +import android.os.Handler +import android.os.HandlerThread +import java.util.* + +class TransactionRepository(val dao: TransactionDao) { + val handler: Handler + val uiHandler: Handler = Handler() + + init { + val thread = HandlerThread("transactions") + thread.start() + handler = Handler(thread.looper) + } + + fun getTransactionsByType(count: Int, type: TransactionType): LiveData> = + dao.loadMultipleByType(count, type) + + fun getTransactions(count: Int): LiveData> = dao.loadMultiple(count) + +// fun getTransactions(count: Int): LiveData> { +// val data = MutableLiveData>() +// +// handler.post { +// val transactions = ArrayList() +// for (i in 0..count) { +// transactions.add(Transaction( +// i, +// "Transaction $i", +// Date(), +// "Spent some money on something", +// (Math.random() * 100).toFloat(), +// TransactionType.EXPENSE +// )) +// } +// +// uiHandler.post { +// data.value = transactions +// } +// } +// +// return data +// } + + fun getTransaction(id: Int): LiveData = dao.load(id) + + + fun save(transaction: Transaction) { + handler.post { dao.save(transaction) } + } + + + fun getCurrentBalance(): LiveData = dao.getBalance() +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionType.kt b/app/src/main/java/com/wbrawner/myallowance/data/TransactionType.kt new file mode 100644 index 0000000..b979836 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/data/TransactionType.kt @@ -0,0 +1,10 @@ +package com.wbrawner.myallowance.data + +import android.support.annotation.StringRes +import com.wbrawner.myallowance.R +import java.io.Serializable + +enum class TransactionType(@StringRes val title: Int, @StringRes val addTitle: Int) : Serializable { + INCOME(R.string.title_income, R.string.title_add_income), + EXPENSE(R.string.title_expenses, R.string.title_add_expense); +} diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TransactionsDatabase.kt b/app/src/main/java/com/wbrawner/myallowance/data/TransactionsDatabase.kt new file mode 100644 index 0000000..5ef79c2 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/data/TransactionsDatabase.kt @@ -0,0 +1,11 @@ +package com.wbrawner.myallowance.data + +import android.arch.persistence.room.Database +import android.arch.persistence.room.RoomDatabase +import android.arch.persistence.room.TypeConverters + +@Database(entities = [(Transaction::class)], version = 1, exportSchema = false) +@TypeConverters(DateTypeConverter::class, TransactionTypeTypeConverter::class) +abstract class TransactionsDatabase: RoomDatabase() { + abstract fun dao(): TransactionDao +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/data/TypeConverters.kt b/app/src/main/java/com/wbrawner/myallowance/data/TypeConverters.kt new file mode 100644 index 0000000..b3e70d2 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/data/TypeConverters.kt @@ -0,0 +1,25 @@ +package com.wbrawner.myallowance.data + +import java.text.SimpleDateFormat +import java.util.* + +class TransactionTypeTypeConverter { + @android.arch.persistence.room.TypeConverter + fun toTransactionType(value: String): TransactionType? = TransactionType.valueOf(value) + + @android.arch.persistence.room.TypeConverter + fun toString(type: TransactionType?): String? = type?.name +} + +class DateTypeConverter { + @android.arch.persistence.room.TypeConverter + fun toDate(value: String): Date? = dateFormat.parse(value) + + @android.arch.persistence.room.TypeConverter + fun toString(date: Date): String? = dateFormat.format(date) + + companion object { + @JvmStatic + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + } +} diff --git a/app/src/main/java/com/wbrawner/myallowance/overview/OverviewFragment.kt b/app/src/main/java/com/wbrawner/myallowance/overview/OverviewFragment.kt new file mode 100644 index 0000000..bb9d80f --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/overview/OverviewFragment.kt @@ -0,0 +1,67 @@ +package com.wbrawner.myallowance.overview + +import android.arch.lifecycle.Observer +import android.arch.lifecycle.ViewModelProviders +import android.os.Bundle +import android.support.v4.app.Fragment +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 + +class OverviewFragment : Fragment() { + lateinit var viewModel: TransactionViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (activity == null) { + return + } + + if (savedInstanceState != null) { + return + } + + viewModel = ViewModelProviders.of(activity!!).get(TransactionViewModel::class.java) + + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + val view = inflater.inflate(R.layout.fragment_overview, container, false) + viewModel.getTransactions(1).observe(this, Observer { data -> + if (data == null || data.isEmpty()) { + showData(view, false) + return@Observer + } + + viewModel.getCurrentBalance().observe(this, Observer { balance -> + val safeBalance: Double = balance?: 0.0 + val balanceView = view.findViewById(R.id.overview_current_balance) + val color = when { + safeBalance > 0.0 -> R.color.colorTextGreen + safeBalance == 0.0 -> R.color.colorTextPrimary + else -> R.color.colorTextRed + } + balanceView.setTextColor(resources.getColor(color, activity!!.theme)) + balanceView.text = String.format("${'$'}%.02f", safeBalance) + }) + showData(view, true) + }) + return view + } + + private fun showData(view: View, show: Boolean) { + val dataVisibility = if (show) View.VISIBLE else View.GONE + val noDataVisibility = if (show) View.GONE else View.VISIBLE + view.findViewById(R.id.overview_current_balance_label).visibility = dataVisibility + view.findViewById(R.id.overview_current_balance).visibility = dataVisibility + view.findViewById(R.id.overview_no_data).visibility = noDataVisibility + } + + companion object { + const val TAG_FRAGMENT = "overview" + const val TITLE_FRAGMENT = R.string.title_dashboard + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionAdapter.kt b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionAdapter.kt new file mode 100644 index 0000000..379d30c --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionAdapter.kt @@ -0,0 +1,31 @@ +package com.wbrawner.myallowance.transactions + +import android.support.v7.widget.RecyclerView +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.data.Transaction + +class TransactionAdapter(private val data: List) + : RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.list_item_transaction, parent, false) + return ViewHolder(view) + } + + override fun getItemCount(): Int = data.size + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val transaction = data[position] + holder.title.text = transaction.title + holder.amount.text = String.format("${'$'}%.02f", transaction.amount) + } + + inner class ViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) { + val title = itemView.findViewById(R.id.transaction_title) + val amount = itemView.findViewById(R.id.transaction_amount) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListActivity.kt b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListActivity.kt new file mode 100644 index 0000000..3be3d42 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListActivity.kt @@ -0,0 +1,56 @@ +package com.wbrawner.myallowance.transactions + +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +import android.support.annotation.StringRes +import com.wbrawner.myallowance.R +import com.wbrawner.myallowance.data.TransactionType +import com.wbrawner.myallowance.overview.OverviewFragment +import kotlinx.android.synthetic.main.activity_transaction_list.* + +class TransactionListActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_transaction_list) + + menu_main.setOnNavigationItemSelectedListener { item -> + when (item.itemId) { + R.id.action_expenses -> updateFragment(TransactionType.EXPENSE) + R.id.action_income -> updateFragment(TransactionType.INCOME) + else -> + updateFragment(OverviewFragment.TAG_FRAGMENT, OverviewFragment.TITLE_FRAGMENT) + } + true + } + menu_main.selectedItemId = R.id.action_overview + } + + private fun updateFragment(type: TransactionType) { + updateFragment(type.name, type.title) + } + + private fun updateFragment(tag: String, @StringRes title: Int) { + setTitle(title) + var fragment = supportFragmentManager.findFragmentByTag(tag) + val ft = supportFragmentManager.beginTransaction() + if (fragment == null) { + fragment = if (tag == "overview") OverviewFragment() + else + TransactionListFragment().apply { + arguments = Bundle().apply { + putSerializable(TransactionListFragment.ARG_TYPE, TransactionType.valueOf(tag)) + } + } + ft.add(R.id.content_container, fragment, tag) + } + for (fmFragment in supportFragmentManager.fragments) { + if (fmFragment == fragment) { + ft.show(fmFragment) + } else { + ft.hide(fmFragment) + } + } + + ft.commit() + } +} diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListFragment.kt b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListFragment.kt new file mode 100644 index 0000000..560f411 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionListFragment.kt @@ -0,0 +1,67 @@ +package com.wbrawner.myallowance.transactions + +import android.arch.lifecycle.Observer +import android.arch.lifecycle.ViewModelProviders +import android.content.Intent +import android.os.Bundle +import android.support.annotation.StringRes +import android.support.design.widget.FloatingActionButton +import android.support.v4.app.Fragment +import android.support.v7.widget.LinearLayoutManager +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 java.io.Serializable + +class TransactionListFragment : Fragment() { + lateinit var viewModel: TransactionViewModel + lateinit var type: TransactionType + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (activity == null) { + return + } + + if (savedInstanceState != null) { + return + } + + type = arguments?.getSerializable(ARG_TYPE) as? TransactionType ?: TransactionType.EXPENSE + + viewModel = ViewModelProviders.of(activity!!).get(TransactionViewModel::class.java) + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + val view = inflater.inflate(R.layout.fragment_transaction_list, container, false) + val recyclerView = view.findViewById(R.id.list_transactions) + recyclerView.layoutManager = LinearLayoutManager(activity) + viewModel.getTransactionsByType(20, type) + .observe(this, Observer> { data -> + if (data == null) { + recyclerView.adapter = null + } else { + recyclerView.adapter = TransactionAdapter(data) + } + }) + view.findViewById(R.id.fab_add_transaction).setOnClickListener { + startActivity( + Intent(activity, AddEditTransactionActivity::class.java).apply { + this.putExtra(EXTRA_TYPE, this@TransactionListFragment.type.name) + } + ) + } + + return view + } + + companion object { + const val ARG_TYPE = "TRANSACTION_TYPE" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionViewModel.kt b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionViewModel.kt new file mode 100644 index 0000000..9317a45 --- /dev/null +++ b/app/src/main/java/com/wbrawner/myallowance/transactions/TransactionViewModel.kt @@ -0,0 +1,24 @@ +package com.wbrawner.myallowance.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 + +class TransactionViewModel(application: Application): AndroidViewModel(application) { + private val transactionRepo = TransactionRepository((application as AllowanceApplication).dao) + + fun getTransaction(id: Int): LiveData = transactionRepo.getTransaction(id) + + fun getTransactions(count: Int): LiveData> = transactionRepo.getTransactions(count) + + fun getTransactionsByType(count: Int, type: TransactionType): LiveData> + = transactionRepo.getTransactionsByType(count, type) + + fun getCurrentBalance(): LiveData = transactionRepo.getCurrentBalance() + + fun saveTransaction(transaction: Transaction) = transactionRepo.save(transaction) +} \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_attach_money.png b/app/src/main/res/drawable-hdpi/ic_shortcut_attach_money.png new file mode 100644 index 0000000..3d06dda Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_attach_money.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_money_off.png b/app/src/main/res/drawable-hdpi/ic_shortcut_money_off.png new file mode 100644 index 0000000..9c6947c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_money_off.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_attach_money.png b/app/src/main/res/drawable-mdpi/ic_shortcut_attach_money.png new file mode 100644 index 0000000..be78016 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_attach_money.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_money_off.png b/app/src/main/res/drawable-mdpi/ic_shortcut_money_off.png new file mode 100644 index 0000000..1b5d510 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_money_off.png differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_attach_money.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_attach_money.png new file mode 100644 index 0000000..b8cfcef Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_attach_money.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_money_off.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_money_off.png new file mode 100644 index 0000000..6f390c3 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_money_off.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_attach_money.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_attach_money.png new file mode 100644 index 0000000..655d37c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_attach_money.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_money_off.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_money_off.png new file mode 100644 index 0000000..3c6455c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_money_off.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attach_money.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attach_money.png new file mode 100644 index 0000000..4b1d902 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attach_money.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_money_off.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_money_off.png new file mode 100644 index 0000000..db6910a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_money_off.png differ diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml new file mode 100644 index 0000000..b9b8eca --- /dev/null +++ b/app/src/main/res/drawable/ic_add_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_attach_money_black_24dp.xml b/app/src/main/res/drawable/ic_attach_money_black_24dp.xml new file mode 100644 index 0000000..b520fc9 --- /dev/null +++ b/app/src/main/res/drawable/ic_attach_money_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_dashboard_24dp.xml b/app/src/main/res/drawable/ic_baseline_dashboard_24dp.xml new file mode 100644 index 0000000..59aa044 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_dashboard_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_money_off_black_24dp.xml b/app/src/main/res/drawable/ic_money_off_black_24dp.xml new file mode 100644 index 0000000..32bd881 --- /dev/null +++ b/app/src/main/res/drawable/ic_money_off_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml new file mode 100644 index 0000000..a7a81a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_save_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_add_edit_transaction.xml b/app/src/main/res/layout/activity_add_edit_transaction.xml new file mode 100644 index 0000000..b2a43cb --- /dev/null +++ b/app/src/main/res/layout/activity_add_edit_transaction.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_transaction_list.xml b/app/src/main/res/layout/activity_transaction_list.xml new file mode 100644 index 0000000..3cf6cc1 --- /dev/null +++ b/app/src/main/res/layout/activity_transaction_list.xml @@ -0,0 +1,27 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml new file mode 100644 index 0000000..a976e13 --- /dev/null +++ b/app/src/main/res/layout/fragment_overview.xml @@ -0,0 +1,46 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_transaction_list.xml b/app/src/main/res/layout/fragment_transaction_list.xml new file mode 100644 index 0000000..7ed6e3e --- /dev/null +++ b/app/src/main/res/layout/fragment_transaction_list.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_transaction.xml b/app/src/main/res/layout/list_item_transaction.xml new file mode 100644 index 0000000..068bd0d --- /dev/null +++ b/app/src/main/res/layout/list_item_transaction.xml @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/main_navigation.xml b/app/src/main/res/menu/main_navigation.xml new file mode 100644 index 0000000..87a976d --- /dev/null +++ b/app/src/main/res/menu/main_navigation.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_add_edit.xml b/app/src/main/res/menu/menu_add_edit.xml new file mode 100644 index 0000000..eab1791 --- /dev/null +++ b/app/src/main/res/menu/menu_add_edit.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a2f5908 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..1b52399 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..ff10afd Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..115a4c7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..dcd3cd8 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..459ca60 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..8ca12fe Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8e19b41 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..b824ebd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..4c19a13 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..2a61c1d --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,9 @@ + + + #3F51B5 + #303F9F + #FF4081 + #FF000000 + #388e3c + #d32f2f + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c28cef3 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,16 @@ + + My Allowance + Title + Add Income + Add Expense + Add Transaction + Description + Date + Amount + Expenses + Income + Dashboard + Current Balance + Add some transactions to see an overview of your spending here + Save + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cd855c9 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml new file mode 100644 index 0000000..81e6972 --- /dev/null +++ b/app/src/main/res/xml/shortcuts.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt b/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt new file mode 100644 index 0000000..52bdaa8 --- /dev/null +++ b/app/src/test/java/com/wbrawner/myallowance/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.wbrawner.myallowance + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3880fd4 --- /dev/null +++ b/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.2.41' + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..743d692 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f20b0fe --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Jul 30 21:54:00 CDT 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'