Skip to content

Commit 8266963

Browse files
author
Jay Kallen
committed
Published to play store
1 parent 8d95d33 commit 8266963

34 files changed

+119
-123
lines changed

‎app/build.gradle

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ apply plugin: "androidx.navigation.safeargs"
88
android {
99
compileSdkVersion 28
1010
defaultConfig {
11-
applicationId "com.jaykallen.racquet3"
11+
applicationId "com.jaykallen.racquet"
1212
minSdkVersion 23
1313
targetSdkVersion 28
14-
versionCode 1
15-
versionName "1.0"
14+
versionCode 6
15+
versionName "3.0"
1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
1818
buildTypes {
@@ -50,11 +50,10 @@ dependencies {
5050
// Live Data
5151
implementation 'android.arch.lifecycle:extensions:1.1.1'
5252
annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
53+
// Databinding
54+
kapt "com.android.databinding:compiler:3.1.4"
5355
// Google Admob
5456
implementation 'com.google.android.gms:play-services-ads:18.3.0'
55-
56-
// // Google Admob
57-
// implementation 'com.google.android.gms:play-services-ads:18.3.0'
5857
// // GDPR consent
5958
// implementation 'com.google.android.ads.consent:consent-library:1.0.7'
6059
}

‎app/release/app-release.apk

4.86 MB
Binary file not shown.

‎app/release/output.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"3.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

‎app/src/androidTest/java/com/jaykallen/racquet3/ExampleInstrumentedTest.kt ‎app/src/androidTest/java/com/jaykallen/racquet/ExampleInstrumentedTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3
1+
package com.jaykallen.racquet
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
1919
fun useAppContext() {
2020
// Context of the app under test.
2121
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("com.jaykallen.racquet3", appContext.packageName)
22+
assertEquals("com.jaykallen.racquet", appContext.packageName)
2323
}
2424
}

‎app/src/main/AndroidManifest.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.jaykallen.racquet3">
3+
package="com.jaykallen.racquet">
44

5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7+
<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
8+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
510
<application
6-
android:name=".StartApp"
11+
android:name="com.jaykallen.racquet.StartApp"
712
android:allowBackup="true"
813
android:icon="@mipmap/ic_launcher"
914
android:label="@string/app_name"
1015
android:roundIcon="@mipmap/ic_launcher_round"
1116
android:supportsRtl="true"
1217
android:theme="@style/AppTheme">
13-
<activity android:name=".ui.MainActivity">
18+
<activity android:name="com.jaykallen.racquet.ui.MainActivity">
1419
<intent-filter>
1520
<action android:name="android.intent.action.MAIN" />
1621
<action android:name="android.intent.action.VIEW" />

‎app/src/main/java/com/jaykallen/racquet3/StartApp.kt ‎app/src/main/java/com/jaykallen/racquet/StartApp.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3
1+
package com.jaykallen.racquet
22

33
import android.app.Application
44
import android.content.Context

‎app/src/main/java/com/jaykallen/racquet3/managers/Helper.kt ‎app/src/main/java/com/jaykallen/racquet/managers/Helper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.managers
1+
package com.jaykallen.racquet.managers
22

33
// Created by jkallen on 4/5/2017
44

‎app/src/main/java/com/jaykallen/racquet3/managers/SharedPrefsManager.kt ‎app/src/main/java/com/jaykallen/racquet/managers/SharedPrefsManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.managers
1+
package com.jaykallen.racquet.managers
22

33
// Created by jkallen on 4/4/2017
44

‎app/src/main/java/com/jaykallen/racquet3/model/RacquetModel.kt ‎app/src/main/java/com/jaykallen/racquet/model/RacquetModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.model
1+
package com.jaykallen.racquet.model
22

33
import androidx.room.ColumnInfo
44
import androidx.room.Entity

‎app/src/main/java/com/jaykallen/racquet3/model/RulerModel.kt ‎app/src/main/java/com/jaykallen/racquet/model/RulerModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.model
1+
package com.jaykallen.racquet.model
22

33
data class RulerModel (
44
var row: Int = 0,

‎app/src/main/java/com/jaykallen/racquet3/room/RoomDao.kt ‎app/src/main/java/com/jaykallen/racquet/room/RoomDao.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.jaykallen.racquet3.room
1+
package com.jaykallen.racquet.room
22

33
import androidx.room.*
4-
import com.jaykallen.racquet3.model.RacquetModel
4+
import com.jaykallen.racquet.model.RacquetModel
55

66
@Dao
77
interface RoomDao {

‎app/src/main/java/com/jaykallen/racquet3/room/RoomRepository.kt ‎app/src/main/java/com/jaykallen/racquet/room/RoomRepository.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.jaykallen.racquet3.room
1+
package com.jaykallen.racquet.room
22

3-
import com.jaykallen.racquet3.model.RacquetModel
3+
import com.jaykallen.racquet.model.RacquetModel
44

55
// 2019-11-22 JK: Modified so that live data is only used in the view model
66

‎app/src/main/java/com/jaykallen/racquet3/room/RoomyDatabase.kt ‎app/src/main/java/com/jaykallen/racquet/room/RoomyDatabase.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.jaykallen.racquet3.room
1+
package com.jaykallen.racquet.room
22

33
import android.content.Context
44
import androidx.room.Database
55
import androidx.room.Room
66
import androidx.room.RoomDatabase
7-
import com.jaykallen.racquet3.model.RacquetModel
7+
import com.jaykallen.racquet.model.RacquetModel
88

99

1010
@Database(entities = [RacquetModel::class], version = 4, exportSchema = false)

‎app/src/main/java/com/jaykallen/racquet3/ui/CatalogAdapter.kt ‎app/src/main/java/com/jaykallen/racquet/ui/CatalogAdapter.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33
import android.view.LayoutInflater
44
import android.view.View
55
import android.view.ViewGroup
66
import android.widget.TextView
77
import androidx.recyclerview.widget.RecyclerView
8-
import com.jaykallen.racquet3.R
9-
import com.jaykallen.racquet3.model.RacquetModel
8+
import com.jaykallen.racquet.R
9+
import com.jaykallen.racquet.model.RacquetModel
1010
import kotlinx.android.synthetic.main.recycler_racquet.view.*
1111

1212

‎app/src/main/java/com/jaykallen/racquet3/ui/CatalogFragment.kt ‎app/src/main/java/com/jaykallen/racquet/ui/CatalogFragment.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33
import android.os.Bundle
44
import android.view.LayoutInflater
@@ -11,10 +11,9 @@ import androidx.navigation.Navigation
1111
import androidx.recyclerview.widget.LinearLayoutManager
1212
import com.google.android.gms.ads.AdRequest
1313
import com.google.android.gms.ads.MobileAds
14-
import com.jaykallen.racquet3.R
15-
import com.jaykallen.racquet3.StartApp
16-
import com.jaykallen.racquet3.model.RacquetModel
17-
import com.jaykallen.racquet3.viewmodel.CatalogViewModel
14+
import com.jaykallen.racquet.R
15+
import com.jaykallen.racquet.model.RacquetModel
16+
import com.jaykallen.racquet.viewmodel.CatalogViewModel
1817
import kotlinx.android.synthetic.main.content_main_toolbar.*
1918
import kotlinx.android.synthetic.main.fragment_catalog.*
2019

‎app/src/main/java/com/jaykallen/racquet3/ui/DetailFragment.kt ‎app/src/main/java/com/jaykallen/racquet/ui/DetailFragment.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33
import android.app.Dialog
44
import android.os.Bundle
@@ -12,12 +12,12 @@ import androidx.fragment.app.Fragment
1212
import androidx.lifecycle.Observer
1313
import androidx.lifecycle.ViewModelProviders
1414
import androidx.navigation.Navigation
15-
import com.jaykallen.racquet3.R
16-
import com.jaykallen.racquet3.StartApp
17-
import com.jaykallen.racquet3.managers.Helper
18-
import com.jaykallen.racquet3.managers.SharedPrefsManager
19-
import com.jaykallen.racquet3.model.RacquetModel
20-
import com.jaykallen.racquet3.viewmodel.DetailViewModel
15+
import com.jaykallen.racquet.R
16+
import com.jaykallen.racquet.StartApp
17+
import com.jaykallen.racquet.managers.Helper
18+
import com.jaykallen.racquet.managers.SharedPrefsManager
19+
import com.jaykallen.racquet.model.RacquetModel
20+
import com.jaykallen.racquet.viewmodel.DetailViewModel
2121
import kotlinx.android.synthetic.main.content_main_toolbar.*
2222
import kotlinx.android.synthetic.main.dialog_units.*
2323
import kotlinx.android.synthetic.main.dialog_yesno.*

‎app/src/main/java/com/jaykallen/racquet3/ui/GuideFragment.kt ‎app/src/main/java/com/jaykallen/racquet/ui/GuideFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33

44
import android.os.Bundle
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup
99

10-
import com.jaykallen.racquet3.R
10+
import com.jaykallen.racquet.R
1111

1212
/**
1313
* A simple [Fragment] subclass.

‎app/src/main/java/com/jaykallen/racquet3/ui/HomeFragment.kt ‎app/src/main/java/com/jaykallen/racquet/ui/HomeFragment.kt

+7-15
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,39 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33
import android.app.Dialog
44
import android.os.Bundle
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
88
import android.widget.Button
9-
import androidx.databinding.DataBindingUtil
109
import androidx.fragment.app.Fragment
1110
import androidx.lifecycle.Observer
1211
import androidx.lifecycle.ViewModelProviders
1312
import androidx.navigation.Navigation
1413
import com.google.android.gms.ads.AdRequest
1514
import com.google.android.gms.ads.MobileAds
16-
import com.jaykallen.racquet3.R
17-
import com.jaykallen.racquet3.StartApp
18-
import com.jaykallen.racquet3.databinding.FragmentHomeBinding
19-
import com.jaykallen.racquet3.managers.SharedPrefsManager
20-
import com.jaykallen.racquet3.viewmodel.HomeViewModel
15+
import com.jaykallen.racquet.R
16+
import com.jaykallen.racquet.StartApp
17+
import com.jaykallen.racquet.managers.SharedPrefsManager
18+
import com.jaykallen.racquet.viewmodel.HomeViewModel
2119
import kotlinx.android.synthetic.main.content_main_toolbar.*
2220
import kotlinx.android.synthetic.main.dialog_units.*
2321
import kotlinx.android.synthetic.main.dialog_yesno.*
24-
import kotlinx.android.synthetic.main.fragment_catalog.*
2522
import kotlinx.android.synthetic.main.fragment_home.*
26-
import kotlinx.android.synthetic.main.fragment_home.adView
2723

28-
29-
// JK 2019-11-11: Attempt to use Room db in Sandbox environment to put into Manage Right later.
24+
// JK 2019-12-17: New Version of Racquet using Jetpack
3025

3126
class HomeFragment : Fragment() {
3227
private lateinit var homeViewModel: HomeViewModel
33-
private lateinit var binding: FragmentHomeBinding
3428

3529
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
36-
binding = DataBindingUtil.inflate(inflater, R.layout.fragment_home, container, false)
37-
return binding.root
30+
return inflater.inflate(R.layout.fragment_home, container, false)
3831
}
3932

4033
override fun onActivityCreated(savedInstanceState: Bundle?) {
4134
super.onActivityCreated(savedInstanceState)
4235
println("***************** Home Fragment *******************")
4336
homeViewModel = ViewModelProviders.of(this).get(HomeViewModel::class.java)
44-
binding.viewModel = homeViewModel
4537
setupButtons(view!!)
4638
setupToolbar()
4739
launchStory()

‎app/src/main/java/com/jaykallen/racquet/ui/MainActivity.kt

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.jaykallen.racquet.ui
2+
3+
import android.Manifest
4+
import android.content.pm.PackageManager
5+
import android.os.Build
6+
import androidx.appcompat.app.AppCompatActivity
7+
import android.os.Bundle
8+
import androidx.core.app.ActivityCompat
9+
import com.google.android.gms.ads.MobileAds
10+
import com.jaykallen.racquet.R
11+
12+
class MainActivity : AppCompatActivity() {
13+
14+
override fun onCreate(savedInstanceState: Bundle?) {
15+
super.onCreate(savedInstanceState)
16+
setContentView(R.layout.activity_main)
17+
if (arePermissionsGranted()) {
18+
MobileAds.initialize(this) {}
19+
}
20+
}
21+
22+
private fun arePermissionsGranted(): Boolean {
23+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && this.checkSelfPermission(
24+
Manifest.permission.WRITE_EXTERNAL_STORAGE
25+
) != PackageManager.PERMISSION_GRANTED) {
26+
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE), 1)
27+
return false
28+
}
29+
return true
30+
}
31+
32+
33+
}

‎app/src/main/java/com/jaykallen/racquet3/ui/MeasureFragment.kt ‎app/src/main/java/com/jaykallen/racquet/ui/MeasureFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33

44
import android.os.Bundle
@@ -8,7 +8,7 @@ import android.view.ViewGroup
88
import android.widget.Button
99
import androidx.fragment.app.Fragment
1010
import androidx.navigation.Navigation
11-
import com.jaykallen.racquet3.R
11+
import com.jaykallen.racquet.R
1212
import kotlinx.android.synthetic.main.content_main_toolbar.*
1313

1414
/**

‎app/src/main/java/com/jaykallen/racquet3/ui/RulerAdapter.kt ‎app/src/main/java/com/jaykallen/racquet/ui/RulerAdapter.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33
import android.view.LayoutInflater
44
import android.view.View
55
import android.view.ViewGroup
66
import android.widget.TextView
7-
import androidx.core.content.ContextCompat
87
import androidx.recyclerview.widget.RecyclerView
9-
import com.jaykallen.racquet3.R
10-
import com.jaykallen.racquet3.model.RulerModel
8+
import com.jaykallen.racquet.R
9+
import com.jaykallen.racquet.model.RulerModel
1110
import kotlinx.android.synthetic.main.recycler_ruler.view.*
1211

1312

‎app/src/main/java/com/jaykallen/racquet3/ui/RulerFragment.kt ‎app/src/main/java/com/jaykallen/racquet/ui/RulerFragment.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
package com.jaykallen.racquet3.ui
1+
package com.jaykallen.racquet.ui
22

33

44
import android.os.Bundle
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8-
import android.widget.Button
9-
import android.widget.TextView
108
import androidx.fragment.app.Fragment
119
import androidx.recyclerview.widget.DividerItemDecoration
1210
import androidx.recyclerview.widget.LinearLayoutManager
13-
import com.jaykallen.racquet3.R
14-
import com.jaykallen.racquet3.model.RulerModel
15-
import com.jaykallen.racquet3.ui.RulerAdapter
11+
import com.jaykallen.racquet.R
12+
import com.jaykallen.racquet.model.RulerModel
1613
import kotlinx.android.synthetic.main.content_info_toolbar.*
1714
import kotlinx.android.synthetic.main.fragment_ruler.*
1815

‎app/src/main/java/com/jaykallen/racquet3/viewmodel/CatalogViewModel.kt ‎app/src/main/java/com/jaykallen/racquet/viewmodel/CatalogViewModel.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.jaykallen.racquet3.viewmodel
1+
package com.jaykallen.racquet.viewmodel
22

33
import android.app.Application
44
import androidx.lifecycle.*
5-
import com.jaykallen.racquet3.model.RacquetModel
6-
import com.jaykallen.racquet3.room.RoomRepository
7-
import com.jaykallen.racquet3.room.RoomyDatabase
5+
import com.jaykallen.racquet.model.RacquetModel
6+
import com.jaykallen.racquet.room.RoomRepository
7+
import com.jaykallen.racquet.room.RoomyDatabase
88
import kotlinx.coroutines.*
99

1010
class CatalogViewModel(application: Application) : AndroidViewModel(application) {

‎app/src/main/java/com/jaykallen/racquet3/viewmodel/DetailViewModel.kt ‎app/src/main/java/com/jaykallen/racquet/viewmodel/DetailViewModel.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.jaykallen.racquet3.viewmodel
1+
package com.jaykallen.racquet.viewmodel
22

33
import android.app.Application
44
import androidx.lifecycle.AndroidViewModel
55
import androidx.lifecycle.MutableLiveData
6-
import com.jaykallen.racquet3.model.RacquetModel
7-
import com.jaykallen.racquet3.room.RoomRepository
8-
import com.jaykallen.racquet3.room.RoomyDatabase
6+
import com.jaykallen.racquet.model.RacquetModel
7+
import com.jaykallen.racquet.room.RoomRepository
8+
import com.jaykallen.racquet.room.RoomyDatabase
99
import kotlinx.coroutines.CoroutineScope
1010
import kotlinx.coroutines.Dispatchers
1111
import kotlinx.coroutines.launch

‎app/src/main/java/com/jaykallen/racquet3/viewmodel/HomeViewModel.kt ‎app/src/main/java/com/jaykallen/racquet/viewmodel/HomeViewModel.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package com.jaykallen.racquet3.viewmodel
1+
package com.jaykallen.racquet.viewmodel
22

33
import androidx.lifecycle.MutableLiveData
44
import androidx.lifecycle.ViewModel
5-
import com.jaykallen.racquet3.StartApp
6-
import com.jaykallen.racquet3.model.RacquetModel
7-
import com.jaykallen.racquet3.room.RoomRepository
8-
import com.jaykallen.racquet3.room.RoomyDatabase
5+
import com.jaykallen.racquet.StartApp
6+
import com.jaykallen.racquet.room.RoomRepository
7+
import com.jaykallen.racquet.room.RoomyDatabase
98
import kotlinx.coroutines.*
109

1110
class HomeViewModel : ViewModel() {

0 commit comments

Comments
 (0)