Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit ccc427c

Browse files
7LPdWcaW7LPdWcaW
committed
Merge branch 'develop'
* develop: Removes old snackbar dependency
2 parents 5802ba6 + e448ec1 commit ccc427c

10 files changed

+111
-48
lines changed

‎app/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
repositories {
6-
maven { url 'https://dl.bintray.com/kennyc1012/maven' }
76
mavenCentral()
87
}
98

@@ -77,7 +76,6 @@ dependencies {
7776
implementation 'com.esotericsoftware:kryo:3.0.3'
7877
implementation 'com.google.code.gson:gson:2.8.5'
7978
implementation 'com.squareup:otto:1.3.8'
80-
implementation 'com.kennyc:snackbar:2.0.2'
8179
implementation 'com.github.PhilJay:MPAndroidChart:v2.1.6'
8280
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
8381
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'

‎app/src/main/java/me/anon/grow/fragment/EventListFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import android.view.WindowManager;
2121

2222
import com.esotericsoftware.kryo.Kryo;
23-
import com.kenny.snackbar.SnackBar;
24-
import com.kenny.snackbar.SnackBarListener;
2523

2624
import java.util.ArrayList;
2725
import java.util.Arrays;
@@ -33,6 +31,8 @@
3331
import me.anon.controller.provider.PlantWidgetProvider;
3432
import me.anon.grow.EditWateringActivity;
3533
import me.anon.grow.R;
34+
import me.anon.lib.SnackBar;
35+
import me.anon.lib.SnackBarListener;
3636
import me.anon.lib.Views;
3737
import me.anon.lib.helper.FabAnimator;
3838
import me.anon.lib.manager.PlantManager;

‎app/src/main/java/me/anon/grow/fragment/FeedingScheduleDetailsFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ import android.view.LayoutInflater
99
import android.view.View
1010
import android.view.ViewGroup
1111
import com.esotericsoftware.kryo.Kryo
12-
import com.kenny.snackbar.SnackBar
1312
import kotlinx.android.synthetic.main.feeding_date_stub.view.*
1413
import kotlinx.android.synthetic.main.schedule_details_view.*
1514
import me.anon.grow.R
1615
import me.anon.grow.ScheduleDateDetailsActivity
16+
import me.anon.lib.SnackBar
1717
import me.anon.lib.Unit
1818
import me.anon.lib.helper.FabAnimator
1919
import me.anon.lib.manager.ScheduleManager
20-
import me.anon.lib.show
2120
import me.anon.model.FeedingSchedule
2221
import me.anon.model.FeedingScheduleDate
2322

‎app/src/main/java/me/anon/grow/fragment/FeedingScheduleListFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ import android.view.View
1010
import android.view.ViewGroup
1111
import android.widget.LinearLayout.VERTICAL
1212
import com.esotericsoftware.kryo.Kryo
13-
import com.kenny.snackbar.SnackBar
1413
import kotlinx.android.synthetic.main.schedule_list_view.*
1514
import me.anon.controller.adapter.FeedingScheduleAdapter
1615
import me.anon.grow.FeedingScheduleDetailsActivity
1716
import me.anon.grow.R
17+
import me.anon.lib.SnackBar
1818
import me.anon.lib.helper.FabAnimator
1919
import me.anon.lib.manager.ScheduleManager
20-
import me.anon.lib.show
2120

2221
/**
2322
* Fragment for displaying list of feeding schedules

‎app/src/main/java/me/anon/grow/fragment/PlantDetailsFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
import android.widget.Toast;
4444

4545
import com.esotericsoftware.kryo.Kryo;
46-
import com.kenny.snackbar.SnackBar;
47-
import com.kenny.snackbar.SnackBarListener;
4846

4947
import java.io.BufferedInputStream;
5048
import java.io.BufferedOutputStream;
@@ -74,6 +72,8 @@
7472
import me.anon.grow.ViewPhotosActivity;
7573
import me.anon.lib.DateRenderer;
7674
import me.anon.lib.ExportCallback;
75+
import me.anon.lib.SnackBar;
76+
import me.anon.lib.SnackBarListener;
7777
import me.anon.lib.Views;
7878
import me.anon.lib.helper.AddonHelper;
7979
import me.anon.lib.helper.ExportHelper;

‎app/src/main/java/me/anon/grow/fragment/PlantListFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import android.view.ViewGroup;
2424

2525
import com.esotericsoftware.kryo.Kryo;
26-
import com.kenny.snackbar.SnackBar;
27-
import com.kenny.snackbar.SnackBarListener;
2826

2927
import java.util.ArrayList;
3028
import java.util.Arrays;
@@ -36,6 +34,8 @@
3634
import me.anon.grow.MainActivity;
3735
import me.anon.grow.MainApplication;
3836
import me.anon.grow.R;
37+
import me.anon.lib.SnackBar;
38+
import me.anon.lib.SnackBarListener;
3939
import me.anon.lib.Views;
4040
import me.anon.lib.event.GardenChangeEvent;
4141
import me.anon.lib.helper.BusHelper;

‎app/src/main/java/me/anon/grow/fragment/SettingsFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.view.View;
2828
import android.widget.Toast;
2929

30-
import com.kenny.snackbar.SnackBar;
3130
import com.nostra13.universalimageloader.core.ImageLoader;
3231

3332
import java.io.BufferedInputStream;
@@ -45,6 +44,7 @@
4544
import me.anon.controller.receiver.BackupService;
4645
import me.anon.grow.MainApplication;
4746
import me.anon.grow.R;
47+
import me.anon.lib.SnackBar;
4848
import me.anon.lib.TempUnit;
4949
import me.anon.lib.Unit;
5050
import me.anon.lib.helper.AddonHelper;

‎app/src/main/java/me/anon/grow/fragment/ViewPhotosFragment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
import android.view.ViewGroup;
2828
import android.view.WindowManager;
2929

30-
import com.kenny.snackbar.SnackBar;
31-
import com.kenny.snackbar.SnackBarListener;
32-
3330
import java.io.BufferedInputStream;
3431
import java.io.BufferedOutputStream;
3532
import java.io.File;
@@ -47,6 +44,8 @@
4744
import me.anon.grow.BuildConfig;
4845
import me.anon.grow.MainApplication;
4946
import me.anon.grow.R;
47+
import me.anon.lib.SnackBar;
48+
import me.anon.lib.SnackBarListener;
5049
import me.anon.lib.Views;
5150
import me.anon.lib.helper.AddonHelper;
5251
import me.anon.lib.helper.ExportHelper;

‎app/src/main/java/me/anon/lib/ClassExt.kt‎

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

‎app/src/main/java/me/anon/lib/SnackBar.kt‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
package me.anon.lib
2+
3+
import android.app.Activity
4+
import android.support.annotation.StringRes
5+
import android.support.design.widget.Snackbar
6+
7+
abstract class SnackBarListener
8+
{
9+
abstract fun onSnackBarStarted(o: Any)
10+
abstract fun onSnackBarFinished(o: Any)
11+
abstract fun onSnackBarAction(o: Any)
12+
}
13+
14+
/**
15+
* Snackbar helper class
16+
*/
17+
class SnackBar
18+
{
19+
companion object
20+
{
21+
@JvmStatic
22+
public fun show(context: Activity, @StringRes messageRes: Int, @StringRes actionTextRes: Int = -1,
23+
listener: SnackBarListener
24+
)
25+
{
26+
show(context, context.getString(messageRes),
27+
if (actionTextRes != -1) context.getString(actionTextRes) else "",
28+
listener
29+
)
30+
}
31+
32+
@JvmStatic
33+
public fun show(context: Activity, message: String, listener: SnackBarListener)
34+
{
35+
show(context, message, "", listener)
36+
}
37+
38+
@JvmStatic
39+
public fun show(context: Activity, message: String, actionText: String = "",
40+
listener: SnackBarListener
41+
)
42+
{
43+
SnackBar().show(context, message, actionText, {
44+
listener.onSnackBarStarted(0)
45+
}, {
46+
listener.onSnackBarFinished(0)
47+
}, {
48+
listener.onSnackBarAction(0)
49+
})
50+
}
51+
}
52+
53+
public fun show(context: Activity, @StringRes messageRes: Int)
54+
{
55+
show(context, messageRes)
56+
}
57+
58+
public fun show(context: Activity, @StringRes messageRes: Int, @StringRes actionTextRes: Int = -1,
59+
start: () -> kotlin.Unit = {},
60+
end: () -> kotlin.Unit = {},
61+
action: () -> kotlin.Unit = {}
62+
)
63+
{
64+
show(context, context.getString(messageRes),
65+
if (actionTextRes != -1) context.getString(actionTextRes) else "",
66+
start, end, action
67+
)
68+
}
69+
70+
public fun show(context: Activity, message: String, actionText: String = "",
71+
start: () -> kotlin.Unit = {},
72+
end: () -> kotlin.Unit = {},
73+
action: () -> kotlin.Unit = {}
74+
)
75+
{
76+
val snackbar = Snackbar.make(context.findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT)
77+
78+
if (actionText.isNotEmpty())
79+
{
80+
snackbar.setAction(actionText) { _ ->
81+
action.invoke()
82+
}
83+
}
84+
85+
snackbar.setCallback(object : Snackbar.Callback()
86+
{
87+
override fun onShown(sb: Snackbar?)
88+
{
89+
start.invoke()
90+
}
91+
92+
override fun onDismissed(transientBottomBar: Snackbar?, event: Int)
93+
{
94+
end.invoke()
95+
}
96+
})
97+
98+
snackbar.show()
99+
}
100+
}

0 commit comments

Comments
 (0)