From 3d3ce27929d3ee44047eeecd0ecd1f47566f5f5b Mon Sep 17 00:00:00 2001 From: Christophe smet Date: Wed, 28 Aug 2013 14:14:56 +0200 Subject: [PATCH 1/6] Added set message method --- library/res/layout/dialog_part_progress.xml | 17 +++++++++-------- library/res/values/sdl__theme.xml | 8 ++++++++ .../android/lib/dialogs/BaseDialogFragment.java | 13 +++++++++++-- .../lib/dialogs/SimpleDialogFragment.java | 3 +++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/library/res/layout/dialog_part_progress.xml b/library/res/layout/dialog_part_progress.xml index f849f95..31a3901 100644 --- a/library/res/layout/dialog_part_progress.xml +++ b/library/res/layout/dialog_part_progress.xml @@ -1,15 +1,16 @@ + android:id="@+id/sdl__progressPanel" + style="@style/SDL.Group" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + \ No newline at end of file diff --git a/library/res/values/sdl__theme.xml b/library/res/values/sdl__theme.xml index 8137741..24466c6 100644 --- a/library/res/values/sdl__theme.xml +++ b/library/res/values/sdl__theme.xml @@ -132,6 +132,14 @@ @dimen/grid_4 @dimen/grid_4 + 22sp diff --git a/library/src/eu/inmite/android/lib/dialogs/BaseDialogFragment.java b/library/src/eu/inmite/android/lib/dialogs/BaseDialogFragment.java index 3bdd138..b1c730f 100644 --- a/library/src/eu/inmite/android/lib/dialogs/BaseDialogFragment.java +++ b/library/src/eu/inmite/android/lib/dialogs/BaseDialogFragment.java @@ -38,6 +38,8 @@ */ public abstract class BaseDialogFragment extends DialogFragment { + private static TextView tvMessage; + @Override public Dialog onCreateDialog(Bundle savedInstanceState) { Dialog dialog = new Dialog(getActivity(), R.style.SDL_Dialog); @@ -52,7 +54,8 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { Builder builder = new Builder(this, getActivity(), inflater, container); - return build(builder).create(); + View v = build(builder).create(); + return v; } protected abstract Builder build(Builder initialBuilder); @@ -66,6 +69,12 @@ public void onDestroyView() { super.onDestroyView(); } + public void setMessage(String message) { + if (tvMessage != null) { + this.tvMessage.setText(message); + } + } + /** * Custom dialog builder */ @@ -228,7 +237,7 @@ public View create() { if (mMessage != null) { View viewMessage = mInflater.inflate(R.layout.dialog_part_message, content, false); - TextView tvMessage = (TextView) viewMessage.findViewById(R.id.sdl__message); + tvMessage = (TextView) viewMessage.findViewById(R.id.sdl__message); tvMessage.setText(mMessage); tvMessage.setTextColor(mMessageTextColor); content.addView(viewMessage); diff --git a/library/src/eu/inmite/android/lib/dialogs/SimpleDialogFragment.java b/library/src/eu/inmite/android/lib/dialogs/SimpleDialogFragment.java index 0c573d6..2df8c1a 100644 --- a/library/src/eu/inmite/android/lib/dialogs/SimpleDialogFragment.java +++ b/library/src/eu/inmite/android/lib/dialogs/SimpleDialogFragment.java @@ -22,7 +22,10 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.text.TextUtils; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; /** * Dialog for displaying simple message, message with title or message with title and two buttons. Implement {@link From f945392203b045dffe268de7839b8960684adf8c Mon Sep 17 00:00:00 2001 From: KristofVD Date: Mon, 30 Dec 2013 17:12:59 +0100 Subject: [PATCH 2/6] gradle config update --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 9eac712..47107a4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.6.1+' } } apply plugin: 'android-library' From 08aba830fe8805ecaf1e1fa0650703d4dc3462e5 Mon Sep 17 00:00:00 2001 From: KristofVD Date: Mon, 6 Jan 2014 14:56:07 +0100 Subject: [PATCH 3/6] gradle build version update 0.7+ --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 47107a4..3f815bd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.6.1+' + classpath 'com.android.tools.build:gradle:0.7.+' } } apply plugin: 'android-library' From 9fb2e226026dedee3456bb1009fa4359ac2bb554 Mon Sep 17 00:00:00 2001 From: KristofVD Date: Mon, 6 Jan 2014 15:15:53 +0100 Subject: [PATCH 4/6] Update gradle to 0.7.+ --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 9eac712..3f815bd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.7.+' } } apply plugin: 'android-library' From 4b551ec29cc966efdb460f97bffe93a0885f6ec3 Mon Sep 17 00:00:00 2001 From: KristofVD Date: Mon, 6 Jan 2014 15:59:13 +0100 Subject: [PATCH 5/6] lint fail on error false --- library/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/build.gradle b/library/build.gradle index 3f815bd..8a94da5 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -34,4 +34,8 @@ android { instrumentTest.setRoot('tests') } + + lintOptions { + abortOnError false + } } From 053129b1920cae95bc1befdc7ac78be59eb8b748 Mon Sep 17 00:00:00 2001 From: Jasper van de Klundert Date: Fri, 1 Aug 2014 15:13:04 +0200 Subject: [PATCH 6/6] gradle updated --- library/build.gradle | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 8a94da5..8155b5d 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,9 +2,6 @@ buildscript { repositories { mavenCentral() } - dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' - } } apply plugin: 'android-library' @@ -14,12 +11,12 @@ dependencies { } android { - compileSdkVersion 17 - buildToolsVersion "17" + compileSdkVersion project.hasProperty("android_build_compileSdkVersion")?Integer.parseInt(project.android_build_compileSdkVersion):19 + buildToolsVersion project.hasProperty("android_build_buildToolsVersion")?project.android_build_buildToolsVersion:'19.0.1' defaultConfig { - minSdkVersion 8 - targetSdkVersion 17 + minSdkVersion project.hasProperty("android_build_minSdkVersion")?Integer.parseInt(project.android_build_minSdkVersion):8 + targetSdkVersion project.hasProperty("android_build_targetSdkVersion")?Integer.parseInt(project.android_build_targetSdkVersion):19 } sourceSets { main {