From a964a383f44f437d0dbde4204a3cb89c8d5b2fdb Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 2 Jul 2016 11:05:44 +0100 Subject: [PATCH 1/3] improve home activity styling, add github link --- build.gradle | 2 +- sample/build.gradle | 4 +- .../androidbootstrap/sample/HomeActivity.java | 9 ++- sample/src/main/res/layout/activity_main.xml | 79 ++++++++++++------- sample/src/main/res/values/styles.xml | 5 ++ 5 files changed, 65 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index d2f88c2..235868d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.2' } } diff --git a/sample/build.gradle b/sample/build.gradle index 552f5c5..74b53bf 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -29,6 +29,6 @@ dependencies { compile project (':AndroidBootstrap') // replace with Maven dependency in your app compile 'com.jakewharton:butterknife:7.0.1' - compile 'com.android.support:appcompat-v7:23.3.0' - compile 'com.android.support:support-annotations:23.3.0' + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-annotations:23.4.0' } diff --git a/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/HomeActivity.java b/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/HomeActivity.java index 5e7dfd9..b0fce5d 100644 --- a/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/HomeActivity.java +++ b/sample/src/main/java/com/fractalwrench/androidbootstrap/sample/HomeActivity.java @@ -1,11 +1,10 @@ package com.fractalwrench.androidbootstrap.sample; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import com.beardedhen.androidbootstrap.BootstrapProgressBarGroup; - import butterknife.ButterKnife; import butterknife.OnClick; @@ -17,6 +16,12 @@ public class HomeActivity extends AppCompatActivity { ButterKnife.bind(this); } + @OnClick(R.id.github_btn) void onGithubClicked() { + Intent intent = new Intent(Intent.ACTION_VIEW); startActivity(intent); + intent.setData(Uri.parse("https://github.com/Bearded-Hen/Android-Bootstrap")); + startActivity(intent); + } + @OnClick(R.id.example_bootstrap_button) void onBootstrapButtonExampleClicked() { startActivity(new Intent(this, BootstrapButtonExample.class)); } diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 5225429..99c5343 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -2,6 +2,7 @@ @@ -9,81 +10,101 @@ -