Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update latest dependencies #22

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update latest dependencies #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c48964
Update gradle and dependencies
akexorcist Dec 26, 2017
5d436eb
Update gradle wrapper to 4.1
akexorcist Dec 26, 2017
fa673c9
Change SupportAnimator to Android Animator
akexorcist Dec 26, 2017
fdc6368
Change ActionBarActivity to AppCompatActivity
akexorcist Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
classpath 'com.github.dcendents:android-maven-plugin:1.2'
// NOTE: Do not place your application dependencies here; they belong
Expand Down
52 changes: 27 additions & 25 deletions demo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
apply plugin: 'com.android.application'

repositories {
mavenCentral()
mavenCentral()

maven {
url "https://jitpack.io"
}
maven {
url "https://jitpack.io"
}
google()
}

android {
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION
compileSdkVersion COMPILE_SDK_VERSION as int
buildToolsVersion BUILD_TOOLS_VERSION

defaultConfig {
applicationId "com.bowyer.fabtransitionlayout.demo"
minSdkVersion MIN_SDK_VERSION
targetSdkVersion TARGET_SDK_VERSION as int
versionCode VERSION_CODE as int
versionName VERSION_NAME
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
defaultConfig {
applicationId "com.bowyer.fabtransitionlayout.demo"
minSdkVersion MIN_SDK_VERSION
targetSdkVersion TARGET_SDK_VERSION as int
versionCode VERSION_CODE as int
versionName VERSION_NAME
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile rootProject.ext.androidSupportAppCompatV7Lib
compile 'com.android.support:design:23.4.0'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.github.ksoichiro:android-observablescrollview:1.5.1'
compile project(':fabtransitionlayout')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
compile project(':fabtransitionlayout')
}
89 changes: 49 additions & 40 deletions demo/src/main/java/com/bowyer/fabtransitionlayout/demo/BottomSheetDemoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,74 @@

import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

import com.bowyer.app.fabtransitionlayout.BottomSheetLayout;
import com.bowyer.fabtransitionlayout.demo.adapter.BottomSheetAdapter;
import com.bowyer.fabtransitionlayout.demo.model.BottomSheet;
import com.github.ksoichiro.android.observablescrollview.ObservableListView;

import java.util.ArrayList;
import java.util.List;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;

/**
* Created by Bowyer on 15/08/07.
*/
public class BottomSheetDemoActivity extends ActionBarActivity {

@Bind(R.id.list_view) ObservableListView mObservableListView;
public class BottomSheetDemoActivity extends AppCompatActivity {

@Bind(R.id.bottom_sheet) BottomSheetLayout mBottomSheetLayout;
@BindView(R.id.list_view)
ObservableListView mObservableListView;

@Bind(R.id.list_menu) ListView mMenuList;
@BindView(R.id.bottom_sheet)
BottomSheetLayout mBottomSheetLayout;

@Bind(R.id.fab) FloatingActionButton mFab;
@BindView(R.id.list_menu)
ListView mMenuList;

@Override protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_bottom_sheet);
ButterKnife.bind(this);
initListView();
initListMenu();
mBottomSheetLayout.setFab(mFab);
}
@BindView(R.id.fab)
FloatingActionButton mFab;

private void initListView() {
List<String> list = new ArrayList<String>(100);
for (int i = 0; i < 100; i++) {
list.add("Item " + i);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_bottom_sheet);
ButterKnife.bind(this);
initListView();
initListMenu();
mBottomSheetLayout.setFab(mFab);
}

ArrayAdapter<String> adapter =
new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, list);
mObservableListView.setAdapter(adapter);
}
private void initListView() {
List<String> list = new ArrayList<>(100);
for (int i = 0; i < 100; i++) {
list.add("Item " + i);
}

ArrayAdapter<String> adapter =
new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, list);
mObservableListView.setAdapter(adapter);
}

private void initListMenu() {
ArrayList<BottomSheet> bottomSheets = new ArrayList<>();
bottomSheets.add(
BottomSheet.to().setBottomSheetMenuType(BottomSheet.BottomSheetMenuType.EMAIL));
bottomSheets.add(
BottomSheet.to().setBottomSheetMenuType(BottomSheet.BottomSheetMenuType.ACCOUNT));
bottomSheets.add(
BottomSheet.to().setBottomSheetMenuType(BottomSheet.BottomSheetMenuType.SETTING));
BottomSheetAdapter adapter = new BottomSheetAdapter(this, bottomSheets);
mMenuList.setAdapter(adapter);
}
private void initListMenu() {
ArrayList<BottomSheet> bottomSheets = new ArrayList<>();
bottomSheets.add(
BottomSheet.to().setBottomSheetMenuType(BottomSheet.BottomSheetMenuType.EMAIL));
bottomSheets.add(
BottomSheet.to().setBottomSheetMenuType(BottomSheet.BottomSheetMenuType.ACCOUNT));
bottomSheets.add(
BottomSheet.to().setBottomSheetMenuType(BottomSheet.BottomSheetMenuType.SETTING));
BottomSheetAdapter adapter = new BottomSheetAdapter(this, bottomSheets);
mMenuList.setAdapter(adapter);
}

@OnClick(R.id.fab) void onFabClick() {
mBottomSheetLayout.expandFab();
}
@OnClick(R.id.fab)
void onFabClick() {
mBottomSheetLayout.expandFab();
}
}
139 changes: 78 additions & 61 deletions demo/src/main/java/com/bowyer/fabtransitionlayout/demo/CoordinatorLayoutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,84 +14,101 @@
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

import com.bowyer.app.fabtransitionlayout.FooterLayout;
import com.bowyer.fabtransitionlayout.demo.adapter.RecyclerViewAdapter;

import java.util.ArrayList;
import java.util.List;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class CoordinatorLayoutActivity extends AppCompatActivity {

@Bind(R.id.toolbar) Toolbar mToolbar;
@Bind(R.id.fabtoolbar) FooterLayout mFabToolbar;
@Bind(R.id.fab) FloatingActionButton mFab;
@Bind(R.id.list_view) RecyclerView mListView;
@Bind(R.id.ic_call) ImageView mIcCall;
@Bind(R.id.ic_email) ImageView mIcEmail;
@Bind(R.id.ic_forum) ImageView mIcForum;

@Override protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_coordinator_layout);

ButterKnife.bind(this);
setSupportActionBar(mToolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

initListView();
mFabToolbar.setFab(mFab);
}

private void initListView() {
List<String> list = new ArrayList<String>(100);
for (int i = 0; i < 100; i++) {
list.add("Item " + i);
@BindView(R.id.toolbar)
Toolbar mToolbar;
@BindView(R.id.fabtoolbar)
FooterLayout mFabToolbar;
@BindView(R.id.fab)
FloatingActionButton mFab;
@BindView(R.id.list_view)
RecyclerView mListView;
@BindView(R.id.ic_call)
ImageView mIcCall;
@BindView(R.id.ic_email)
ImageView mIcEmail;
@BindView(R.id.ic_forum)
ImageView mIcForum;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_coordinator_layout);

ButterKnife.bind(this);
setSupportActionBar(mToolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

initListView();
mFabToolbar.setFab(mFab);
}

RecyclerViewAdapter adapter = new RecyclerViewAdapter(list, this.getBaseContext());
mListView.setLayoutManager(new LinearLayoutManager(this.getBaseContext()));
mListView.setAdapter(adapter);
}
private void initListView() {
List<String> list = new ArrayList<>(100);
for (int i = 0; i < 100; i++) {
list.add("Item " + i);
}

@OnClick(R.id.fab) void onFabClick() {
mFabToolbar.expandFab();
}
RecyclerViewAdapter adapter = new RecyclerViewAdapter(list, this.getBaseContext());
mListView.setLayoutManager(new LinearLayoutManager(this.getBaseContext()));
mListView.setAdapter(adapter);
}

@OnClick(R.id.call) void onClickCall() {
iconAnim(mIcCall);
}
@OnClick(R.id.fab)
void onFabClick() {
mFabToolbar.expandFab();
}

@OnClick(R.id.ic_email) void onClickEmail() {
iconAnim(mIcEmail);
}
@OnClick(R.id.call)
void onClickCall() {
iconAnim(mIcCall);
}

@OnClick(R.id.ic_email)
void onClickEmail() {
iconAnim(mIcEmail);
}

@OnClick(R.id.ic_forum)
void onClickForum() {
iconAnim(mIcForum);
}

@OnClick(R.id.ic_forum) void onClickForum() {
iconAnim(mIcForum);
}
private void iconAnim(View icon) {
Animator iconAnim = ObjectAnimator.ofPropertyValuesHolder(icon,
PropertyValuesHolder.ofFloat(View.SCALE_X, 1f, 1.5f, 1f),
PropertyValuesHolder.ofFloat(View.SCALE_Y, 1f, 1.5f, 1f));
iconAnim.start();
}

private void iconAnim(View icon) {
Animator iconAnim = ObjectAnimator.ofPropertyValuesHolder(icon,
PropertyValuesHolder.ofFloat(View.SCALE_X, 1f, 1.5f, 1f),
PropertyValuesHolder.ofFloat(View.SCALE_Y, 1f, 1.5f, 1f));
iconAnim.start();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_coordinator, menu);
return true;
}

@Override public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_coordinator, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {

@Override public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();

int id = item.getItemId();
if (id == R.id.action_snackbar) {
Snackbar.make(mListView, "This is a snackbar", Snackbar.LENGTH_SHORT).show();
return true;
}

if (id == R.id.action_snackbar) {
Snackbar.make(mListView, "This is a snackbar", Snackbar.LENGTH_SHORT).show();
return true;
return super.onOptionsItemSelected(item);
}

return super.onOptionsItemSelected(item);
}
}
Loading