Skip to content

Commit 72db4a0

Browse files
JawnnypooJawnnypoo
committed
modernize
1 parent 2b5537d commit 72db4a0

10 files changed

Lines changed: 84 additions & 78 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Build
2+
on: [pull_request, push]
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- name: Checkout the code
8+
uses: actions/checkout@v2
9+
- name: Build the app
10+
run: ./gradlew build

‎.travis.yml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎app/build.gradle‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ apply plugin: 'com.android.application'
22

33
apply plugin: 'kotlin-android'
44

5-
apply plugin: 'kotlin-android-extensions'
6-
75
android {
8-
compileSdkVersion 30
6+
compileSdkVersion 33
97

108
defaultConfig {
119
applicationId "com.commit451.quickactionview.sample"
12-
minSdkVersion 15
13-
targetSdkVersion 30
10+
minSdkVersion 21
11+
targetSdkVersion 33
1412
versionCode 1
1513
versionName "1.0"
1614
}
@@ -26,11 +24,9 @@ android {
2624
}
2725

2826
dependencies {
29-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30-
31-
implementation 'androidx.appcompat:appcompat:1.2.0'
32-
implementation 'com.google.android.material:material:1.2.1'
33-
implementation 'androidx.recyclerview:recyclerview:1.1.0'
27+
implementation 'androidx.appcompat:appcompat:1.5.1'
28+
implementation 'com.google.android.material:material:1.7.0'
29+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
3430

3531
implementation project(':quickactionview')
3632
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.commit451.quickactionview.sample"
3-
xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.commit451.quickactionview.sample">
44

55
<application
66
android:allowBackup="true"
7-
android:fullBackupContent="true"
87
android:icon="@mipmap/ic_launcher"
98
android:label="@string/app_name"
109
android:supportsRtl="true"
1110
android:theme="@style/AppTheme">
1211
<activity
1312
android:name=".MainActivity"
13+
android:exported="true"
1414
android:label="@string/app_name">
1515

1616
<intent-filter>
17-
<action android:name="android.intent.action.MAIN"/>
17+
<action android:name="android.intent.action.MAIN" />
1818

19-
<category android:name="android.intent.category.LAUNCHER"/>
19+
<category android:name="android.intent.category.LAUNCHER" />
2020
</intent-filter>
2121

2222
</activity>
2323

24-
<activity android:name=".RecyclerViewActivity" >
24+
<activity android:name=".RecyclerViewActivity">
2525

2626
</activity>
2727

‎app/src/main/java/com/commit451/quickactionview/sample/MainActivity.kt‎

Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ package com.commit451.quickactionview.sample
33
import android.annotation.SuppressLint
44
import android.graphics.Color
55
import android.os.Bundle
6-
import com.google.android.material.snackbar.Snackbar
7-
import androidx.core.content.ContextCompat
6+
import android.util.Log
7+
import android.view.View
88
import androidx.appcompat.app.AppCompatActivity
99
import androidx.appcompat.widget.Toolbar
10-
import android.util.Log
11-
10+
import androidx.core.content.ContextCompat
1211
import com.commit451.quickactionview.Action
1312
import com.commit451.quickactionview.QuickActionView
1413
import com.commit451.quickactionview.animator.PopAnimator
15-
import kotlinx.android.synthetic.main.activity_main.*
14+
import com.google.android.material.snackbar.Snackbar
1615

1716
/**
1817
* Shows general use of the QuickActionView
@@ -23,51 +22,70 @@ class MainActivity : AppCompatActivity() {
2322
private const val TAG = "QuickActionView"
2423
}
2524

25+
private lateinit var root: View
26+
2627
override fun onCreate(savedInstanceState: Bundle?) {
2728
super.onCreate(savedInstanceState)
2829
setContentView(R.layout.activity_main)
29-
buttonRecyclerview.setOnClickListener { startActivity(RecyclerViewActivity.newIntent(this@MainActivity)) }
30+
findViewById<View>(R.id.buttonRecyclerview).setOnClickListener {
31+
startActivity(
32+
RecyclerViewActivity.newIntent(this@MainActivity)
33+
)
34+
}
3035
val toolbar = findViewById<Toolbar>(R.id.toolbar)
36+
val normalParent = findViewById<View>(R.id.normalParent)
37+
val customParent = findViewById<View>(R.id.customParent)
38+
root = findViewById(R.id.root)
3139
setSupportActionBar(toolbar)
3240
QuickActionView.make(this)
33-
.addActions(R.menu.actions)
34-
.setOnActionSelectedListener { action, _ -> onAction(action) }
35-
.setOnShowListener { Log.d(TAG, "onShow") }
36-
.setOnDismissListener { Log.d(TAG, "onDismiss") }
37-
.setOnActionHoverChangedListener { _, _, hovering -> Log.d(TAG, "onHover $hovering") }
38-
.register(normalParent)
41+
.addActions(R.menu.actions)
42+
.setOnActionSelectedListener { action, _ -> onAction(action) }
43+
.setOnShowListener { Log.d(TAG, "onShow") }
44+
.setOnDismissListener { Log.d(TAG, "onDismiss") }
45+
.setOnActionHoverChangedListener { _, _, hovering -> Log.d(TAG, "onHover $hovering") }
46+
.register(normalParent)
3947
normalParent.setOnClickListener {
4048
Snackbar.make(root, "View was clicked", Snackbar.LENGTH_SHORT)
41-
.show()
49+
.show()
4250
}
4351

4452
@SuppressLint("ResourceType")
4553
val actionConfig = Action.Config(this)
46-
.setBackgroundColorStateList(ContextCompat.getColorStateList(this, R.drawable.sample_background_color)!!)
47-
.setTextColor(Color.MAGENTA)
54+
.setBackgroundColorStateList(
55+
ContextCompat.getColorStateList(
56+
this,
57+
R.drawable.sample_background_color
58+
)!!
59+
)
60+
.setTextColor(Color.MAGENTA)
4861

4962
val popAnimator = PopAnimator(true)
5063
val actionTitleAnimator = CustomActionsTitleAnimator()
5164
val qav = QuickActionView.make(this)
52-
.addActions(R.menu.actions_2)
53-
.setOnActionSelectedListener { action, _ -> onAction(action) }
54-
.setBackgroundColor(Color.RED)
55-
.setTextColor(Color.BLUE)
56-
.setTextSize(30)
57-
.setScrimColor(Color.parseColor("#99FFFFFF"))
58-
.setTextBackgroundDrawable(R.drawable.text_background)
59-
.setIndicatorDrawable(ContextCompat.getDrawable(this@MainActivity, R.drawable.indicator)!!)
60-
.setActionConfig(actionConfig, R.id.action_add_to_cart)
61-
.setActionsOutAnimator(popAnimator)
62-
.setActionsTitleInAnimator(actionTitleAnimator)
63-
.setActionsTitleOutAnimator(actionTitleAnimator)
64-
.register(customParent)
65+
.addActions(R.menu.actions_2)
66+
.setOnActionSelectedListener { action, _ -> onAction(action) }
67+
.setBackgroundColor(Color.RED)
68+
.setTextColor(Color.BLUE)
69+
.setTextSize(30)
70+
.setScrimColor(Color.parseColor("#99FFFFFF"))
71+
.setTextBackgroundDrawable(R.drawable.text_background)
72+
.setIndicatorDrawable(
73+
ContextCompat.getDrawable(
74+
this@MainActivity,
75+
R.drawable.indicator
76+
)!!
77+
)
78+
.setActionConfig(actionConfig, R.id.action_add_to_cart)
79+
.setActionsOutAnimator(popAnimator)
80+
.setActionsTitleInAnimator(actionTitleAnimator)
81+
.setActionsTitleOutAnimator(actionTitleAnimator)
82+
.register(customParent)
6583
val customActionsInAnimator = CustomActionsInAnimator(qav)
6684
qav.setActionsInAnimator(customActionsInAnimator)
6785
}
6886

6987
private fun onAction(action: Action) {
7088
Snackbar.make(root, action.title.toString() + " was chosen", Snackbar.LENGTH_SHORT)
71-
.show()
89+
.show()
7290
}
7391
}

‎app/src/main/java/com/commit451/quickactionview/sample/RecyclerViewActivity.kt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,10 @@ package com.commit451.quickactionview.sample
33
import android.content.Context
44
import android.content.Intent
55
import android.os.Bundle
6-
import com.google.android.material.snackbar.Snackbar
76
import androidx.appcompat.app.AppCompatActivity
8-
import androidx.recyclerview.widget.GridLayoutManager
9-
import androidx.recyclerview.widget.RecyclerView
107
import androidx.appcompat.widget.Toolbar
11-
import android.view.ViewGroup
12-
import kotlinx.android.synthetic.main.activity_recyclerview.*
13-
14-
import java.util.ArrayList
8+
import androidx.recyclerview.widget.RecyclerView
9+
import com.google.android.material.snackbar.Snackbar
1510

1611
/**
1712
* Shows usage of the QuickActionView from within a RecyclerView
@@ -30,12 +25,13 @@ class RecyclerViewActivity : AppCompatActivity() {
3025
super.onCreate(savedInstanceState)
3126
setContentView(R.layout.activity_recyclerview)
3227
val toolbar = findViewById<Toolbar>(R.id.toolbar)
28+
val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
3329
setSupportActionBar(toolbar)
3430
recyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 2)
3531
adapter = CheeseAdapter(this, object : CheeseAdapter.Listener {
3632
override fun onItemClicked(cheese: Cheese) {
3733
Snackbar.make(recyclerView, cheese.name + " was clicked", Snackbar.LENGTH_SHORT)
38-
.show()
34+
.show()
3935
}
4036
})
4137
recyclerView.adapter = adapter
@@ -44,7 +40,7 @@ class RecyclerViewActivity : AppCompatActivity() {
4440
}
4541

4642
private fun loadCheeses() {
47-
val cheeses = ArrayList<Cheese>()
43+
val cheeses = mutableListOf<Cheese>()
4844
for (i in 0..29) {
4945
cheeses.add(Cheeses.randomCheese())
5046
}

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
2-
ext.kotlin_version = '1.4.10'
2+
ext.kotlin_version = '1.7.20'
33
repositories {
44
google()
5-
jcenter()
5+
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:4.0.1'
8+
classpath 'com.android.tools.build:gradle:7.1.3'
99
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1111
}
@@ -14,7 +14,7 @@ buildscript {
1414
allprojects {
1515
repositories {
1616
google()
17-
jcenter()
17+
mavenCentral()
1818
}
1919
}
2020

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎quickactionview/build.gradle‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'com.android.library'
33
apply plugin: 'kotlin-android'
44

55
android {
6-
compileSdkVersion 30
6+
compileSdkVersion 33
77

88
defaultConfig {
9-
minSdkVersion 15
10-
targetSdkVersion 30
9+
minSdkVersion 21
10+
targetSdkVersion 33
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -23,9 +23,5 @@ android {
2323
}
2424

2525
dependencies {
26-
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
27-
28-
api 'androidx.appcompat:appcompat:1.2.0'
26+
api 'androidx.appcompat:appcompat:1.5.1'
2927
}
30-
31-
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'

‎quickactionview/src/main/java/com/commit451/quickactionview/QuickActionView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class QuickActionView private constructor(private val context: Context) {
176176
MenuInflater(context).inflate(menuId, menu)
177177
for (i in 0 until menu.size()) {
178178
val item = menu.getItem(i)
179-
val action = Action(item.itemId, item.icon, item.title)
179+
val action = Action(item.itemId, item.icon!!, item.title!!)
180180
addAction(action)
181181
}
182182
return this

0 commit comments

Comments
 (0)