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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Removes old snackbar dependency
  • Loading branch information
7LPdWcaW committed Feb 1, 2019
2 parents 5802ba6 + e448ec1 commit ccc427c
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 48 deletions.
2 changes: 0 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

repositories {
maven { url 'https://dl.bintray.com/kennyc1012/maven' }
mavenCentral()
}

Expand Down Expand Up @@ -77,7 +76,6 @@ dependencies {
implementation 'com.esotericsoftware:kryo:3.0.3'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.squareup:otto:1.3.8'
implementation 'com.kennyc:snackbar:2.0.2'
implementation 'com.github.PhilJay:MPAndroidChart:v2.1.6'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import android.view.WindowManager;

import com.esotericsoftware.kryo.Kryo;
import com.kenny.snackbar.SnackBar;
import com.kenny.snackbar.SnackBarListener;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -33,6 +31,8 @@
import me.anon.controller.provider.PlantWidgetProvider;
import me.anon.grow.EditWateringActivity;
import me.anon.grow.R;
import me.anon.lib.SnackBar;
import me.anon.lib.SnackBarListener;
import me.anon.lib.Views;
import me.anon.lib.helper.FabAnimator;
import me.anon.lib.manager.PlantManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.esotericsoftware.kryo.Kryo
import com.kenny.snackbar.SnackBar
import kotlinx.android.synthetic.main.feeding_date_stub.view.*
import kotlinx.android.synthetic.main.schedule_details_view.*
import me.anon.grow.R
import me.anon.grow.ScheduleDateDetailsActivity
import me.anon.lib.SnackBar
import me.anon.lib.Unit
import me.anon.lib.helper.FabAnimator
import me.anon.lib.manager.ScheduleManager
import me.anon.lib.show
import me.anon.model.FeedingSchedule
import me.anon.model.FeedingScheduleDate

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout.VERTICAL
import com.esotericsoftware.kryo.Kryo
import com.kenny.snackbar.SnackBar
import kotlinx.android.synthetic.main.schedule_list_view.*
import me.anon.controller.adapter.FeedingScheduleAdapter
import me.anon.grow.FeedingScheduleDetailsActivity
import me.anon.grow.R
import me.anon.lib.SnackBar
import me.anon.lib.helper.FabAnimator
import me.anon.lib.manager.ScheduleManager
import me.anon.lib.show

/**
* Fragment for displaying list of feeding schedules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
import android.widget.Toast;

import com.esotericsoftware.kryo.Kryo;
import com.kenny.snackbar.SnackBar;
import com.kenny.snackbar.SnackBarListener;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
Expand Down Expand Up @@ -74,6 +72,8 @@
import me.anon.grow.ViewPhotosActivity;
import me.anon.lib.DateRenderer;
import me.anon.lib.ExportCallback;
import me.anon.lib.SnackBar;
import me.anon.lib.SnackBarListener;
import me.anon.lib.Views;
import me.anon.lib.helper.AddonHelper;
import me.anon.lib.helper.ExportHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import android.view.ViewGroup;

import com.esotericsoftware.kryo.Kryo;
import com.kenny.snackbar.SnackBar;
import com.kenny.snackbar.SnackBarListener;

import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -36,6 +34,8 @@
import me.anon.grow.MainActivity;
import me.anon.grow.MainApplication;
import me.anon.grow.R;
import me.anon.lib.SnackBar;
import me.anon.lib.SnackBarListener;
import me.anon.lib.Views;
import me.anon.lib.event.GardenChangeEvent;
import me.anon.lib.helper.BusHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import android.view.View;
import android.widget.Toast;

import com.kenny.snackbar.SnackBar;
import com.nostra13.universalimageloader.core.ImageLoader;

import java.io.BufferedInputStream;
Expand All @@ -45,6 +44,7 @@
import me.anon.controller.receiver.BackupService;
import me.anon.grow.MainApplication;
import me.anon.grow.R;
import me.anon.lib.SnackBar;
import me.anon.lib.TempUnit;
import me.anon.lib.Unit;
import me.anon.lib.helper.AddonHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
import android.view.ViewGroup;
import android.view.WindowManager;

import com.kenny.snackbar.SnackBar;
import com.kenny.snackbar.SnackBarListener;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
Expand All @@ -47,6 +44,8 @@
import me.anon.grow.BuildConfig;
import me.anon.grow.MainApplication;
import me.anon.grow.R;
import me.anon.lib.SnackBar;
import me.anon.lib.SnackBarListener;
import me.anon.lib.Views;
import me.anon.lib.helper.AddonHelper;
import me.anon.lib.helper.ExportHelper;
Expand Down
32 changes: 0 additions & 32 deletions app/src/main/java/me/anon/lib/ClassExt.kt

This file was deleted.

100 changes: 100 additions & 0 deletions app/src/main/java/me/anon/lib/SnackBar.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package me.anon.lib

import android.app.Activity
import android.support.annotation.StringRes
import android.support.design.widget.Snackbar

abstract class SnackBarListener
{
abstract fun onSnackBarStarted(o: Any)
abstract fun onSnackBarFinished(o: Any)
abstract fun onSnackBarAction(o: Any)
}

/**
* Snackbar helper class
*/
class SnackBar
{
companion object
{
@JvmStatic
public fun show(context: Activity, @StringRes messageRes: Int, @StringRes actionTextRes: Int = -1,
listener: SnackBarListener
)
{
show(context, context.getString(messageRes),
if (actionTextRes != -1) context.getString(actionTextRes) else "",
listener
)
}

@JvmStatic
public fun show(context: Activity, message: String, listener: SnackBarListener)
{
show(context, message, "", listener)
}

@JvmStatic
public fun show(context: Activity, message: String, actionText: String = "",
listener: SnackBarListener
)
{
SnackBar().show(context, message, actionText, {
listener.onSnackBarStarted(0)
}, {
listener.onSnackBarFinished(0)
}, {
listener.onSnackBarAction(0)
})
}
}

public fun show(context: Activity, @StringRes messageRes: Int)
{
show(context, messageRes)
}

public fun show(context: Activity, @StringRes messageRes: Int, @StringRes actionTextRes: Int = -1,
start: () -> kotlin.Unit = {},
end: () -> kotlin.Unit = {},
action: () -> kotlin.Unit = {}
)
{
show(context, context.getString(messageRes),
if (actionTextRes != -1) context.getString(actionTextRes) else "",
start, end, action
)
}

public fun show(context: Activity, message: String, actionText: String = "",
start: () -> kotlin.Unit = {},
end: () -> kotlin.Unit = {},
action: () -> kotlin.Unit = {}
)
{
val snackbar = Snackbar.make(context.findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT)

if (actionText.isNotEmpty())
{
snackbar.setAction(actionText) { _ ->
action.invoke()
}
}

snackbar.setCallback(object : Snackbar.Callback()
{
override fun onShown(sb: Snackbar?)
{
start.invoke()
}

override fun onDismissed(transientBottomBar: Snackbar?, event: Int)
{
end.invoke()
}
})

snackbar.show()
}
}

0 comments on commit ccc427c

Please sign in to comment.