Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
language: android
android:
components:
- build-tools-20.0.0
- android-21
- extra-android-m2repository
env:
matrix:
- ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
before_script:
# Create and start emulator
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &
- adb wait-for-device
- adb shell input keyevent 82 &

script: ./gradlew connectedAndroidTest
38 changes: 19 additions & 19 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.inmite.demo.dialogs"
android:versionCode="1"
android:versionName="1.0">
package="eu.inmite.demo.dialogs"
android:versionCode="1"
android:versionName="1.0">

<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="17" />
<application
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:theme="@style/CustomDarkTheme">
<activity
android:name=".MyActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="17" />
<application
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:theme="@style/CustomDarkTheme">
<activity
android:name=".MyActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@
*/
public class JayneHatDialogFragment extends SimpleDialogFragment {

public static String TAG = "jayne";
public static String TAG = "jayne";

public static void show(FragmentActivity activity) {
new JayneHatDialogFragment().show(activity.getSupportFragmentManager(), TAG);
}
public static void show(FragmentActivity activity) {
new JayneHatDialogFragment().show(activity.getSupportFragmentManager(), TAG);
}

@Override
public BaseDialogFragment.Builder build(BaseDialogFragment.Builder builder) {
builder.setTitle("Jayne's hat");
builder.setView(LayoutInflater.from(getActivity()).inflate(R.layout.item_jayne_hat, null));
builder.setPositiveButton("I want one", new View.OnClickListener() {
@Override
public void onClick(View v) {
ISimpleDialogListener listener = getDialogListener();
if (listener != null) {
listener.onPositiveButtonClicked(0);
}
dismiss();
}
});
return builder;
}
@Override
public BaseDialogFragment.Builder build(BaseDialogFragment.Builder builder) {
builder.setTitle("Jayne's hat");
builder.setView(LayoutInflater.from(getActivity()).inflate(R.layout.item_jayne_hat, null));
builder.setPositiveButton("I want one", new View.OnClickListener() {
@Override
public void onClick(View v) {
ISimpleDialogListener listener = getDialogListener();
if (listener != null) {
listener.onPositiveButtonClicked(0);
}
dismiss();
}
});
return builder;
}
}
186 changes: 97 additions & 89 deletions demo/src/main/java/eu/inmite/demo/dialogs/MyActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,22 @@

package eu.inmite.demo.dialogs;

import java.text.DateFormat;
import java.util.Date;

import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.widget.Toast;

import java.text.DateFormat;
import java.util.Date;

import eu.inmite.android.lib.dialogs.DatePickerDialogFragment;
import eu.inmite.android.lib.dialogs.IDateDialogListener;
import eu.inmite.android.lib.dialogs.IListDialogListener;
import eu.inmite.android.lib.dialogs.ISimpleDialogCancelListener;
import eu.inmite.android.lib.dialogs.ISimpleDialogListener;
import eu.inmite.android.lib.dialogs.ListDialogFragment;
import eu.inmite.android.lib.dialogs.ProgressDialogFragment;
import eu.inmite.android.lib.dialogs.SimpleDialogFragment;
import eu.inmite.android.lib.dialogs.TimePickerDialogFragment;
import eu.inmite.android.lib.dialogs.*;

public class MyActivity extends FragmentActivity implements
ISimpleDialogListener,
IDateDialogListener,
ISimpleDialogCancelListener,
IListDialogListener {
ISimpleDialogListener,
IDateDialogListener,
ISimpleDialogCancelListener,
IListDialogListener {

public static final int THEME_DEFAULT_DARK = 0;

Expand All @@ -64,48 +56,48 @@ public void onCreate(Bundle savedInstanceState) {
@Override
public void onClick(View v) {
SimpleDialogFragment.createBuilder(c, getSupportFragmentManager())
.setMessage(R.string.message_1).show();
.setMessage(R.string.message_1).show();
}
});
findViewById(R.id.message_title_dialog).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SimpleDialogFragment.createBuilder(c, getSupportFragmentManager())
.setTitle(R.string.title).setMessage(R.string.message_2).show();
.setTitle(R.string.title).setMessage(R.string.message_2).show();
}
});
findViewById(R.id.message_title_buttons_dialog)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SimpleDialogFragment.createBuilder(c, getSupportFragmentManager())
.setTitle(R.string.title)
.setMessage(R.string.message_3)
.setPositiveButtonText(R.string.positive_button)
.setNegativeButtonText(R.string.negative_button).setRequestCode(42)
.setTag("custom-tag")
.show();
}
});
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SimpleDialogFragment.createBuilder(c, getSupportFragmentManager())
.setTitle(R.string.title)
.setMessage(R.string.message_3)
.setPositiveButtonText(R.string.positive_button)
.setNegativeButtonText(R.string.negative_button).setRequestCode(42)
.setTag("custom-tag")
.show();
}
});
findViewById(R.id.progress_dialog).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ProgressDialogFragment.createBuilder(c, getSupportFragmentManager())
.setMessage(R.string.message_4)
.setRequestCode(REQUEST_PROGRESS)
.setTitle(R.string.app_name)
.show();
.setMessage(R.string.message_4)
.setRequestCode(REQUEST_PROGRESS)
.setTitle(R.string.app_name)
.show();
}
});
findViewById(R.id.list_dialog).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ListDialogFragment
.createBuilder(c, getSupportFragmentManager())
.setTitle("Your favorite character:")
.setItems(new String[]{"Jayne", "Malcolm", "Kaylee",
"Wash", "Zoe", "River"})
.show();
.createBuilder(c, getSupportFragmentManager())
.setTitle("Your favorite character:")
.setItems(new String[]{"Jayne", "Malcolm", "Kaylee",
"Wash", "Zoe", "River"})
.show();

}
});
Expand Down Expand Up @@ -139,32 +131,48 @@ public void onClick(View v) {
setCurrentTheme(THEME_CUSTOM_LIGHT);
}
});
findViewById(R.id.time_picker).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
TimePickerDialogFragment
.createBuilder(MyActivity.this, getSupportFragmentManager())
.setDate(new Date())
.set24hour(true)
.setPositiveButtonText(android.R.string.ok)
.setNegativeButtonText(android.R.string.cancel)
.setRequestCode(13)
.show();
}
});
findViewById(R.id.date_picker).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
DatePickerDialogFragment
.createBuilder(MyActivity.this, getSupportFragmentManager())
.setDate(new Date())
.set24hour(true)
.setPositiveButtonText(android.R.string.ok)
.setNegativeButtonText(android.R.string.cancel)
.setRequestCode(12)
.show();
}
});
findViewById(R.id.time_picker).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
TimePickerDialogFragment
.createBuilder(MyActivity.this, getSupportFragmentManager())
.setDate(new Date())
.set24hour(true)
.setPositiveButtonText(android.R.string.ok)
.setNegativeButtonText(android.R.string.cancel)
.setRequestCode(13)
.show();
}
});
findViewById(R.id.date_picker).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
DatePickerDialogFragment
.createBuilder(MyActivity.this, getSupportFragmentManager())
.setDate(new Date())
.set24hour(true)
.setPositiveButtonText(android.R.string.ok)
.setNegativeButtonText(android.R.string.cancel)
.setRequestCode(12)
.show();
}
});

findViewById(R.id.number_picker).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
NumberPickerDialogFragment
.createBuilder(MyActivity.this, getSupportFragmentManager())
.setTitle("Pick a number:")
.setNumber(5)
.setMaxValue(20)
.setMinValue(0)
.setPositiveButtonText(android.R.string.ok)
.setNegativeButtonText(android.R.string.cancel)
.setRequestCode(14)
.show();
}
});
}

// IListDialogListener
Expand Down Expand Up @@ -216,30 +224,30 @@ public void onNeutralButtonClicked(int requestCode) {
// IDateDialogListener

@Override
public void onNegativeButtonClicked(int resultCode, Date date) {
String text="";
if (resultCode==12) {
text="Date ";
} else if (resultCode==13) {
text="Time ";
}
DateFormat dateFormat= DateFormat.getDateInstance(DateFormat.DEFAULT);
Toast.makeText(this,text+"Cancelled "+ dateFormat.format(date),Toast.LENGTH_SHORT).show();
}
@Override
public void onPositiveButtonClicked(int resultCode, Date date) {
String text="";
if (resultCode==12) {
text="Date ";
} else if (resultCode==13) {
text="Time ";
}
DateFormat dateFormat= DateFormat.getDateTimeInstance();
Toast.makeText(this,text+ "Success! "+ dateFormat.format(date),Toast.LENGTH_SHORT).show();
}
public void onNegativeButtonClicked(int resultCode, Date date) {
String text = "";
if (resultCode == 12) {
text = "Date ";
} else if (resultCode == 13) {
text = "Time ";
}

DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.DEFAULT);
Toast.makeText(this, text + "Cancelled " + dateFormat.format(date), Toast.LENGTH_SHORT).show();
}

@Override
public void onPositiveButtonClicked(int resultCode, Date date) {
String text = "";
if (resultCode == 12) {
text = "Date ";
} else if (resultCode == 13) {
text = "Time ";
}

DateFormat dateFormat = DateFormat.getDateTimeInstance();
Toast.makeText(this, text + "Success! " + dateFormat.format(date), Toast.LENGTH_SHORT).show();
}

private void setCurrentTheme(int theme) {
Intent i = new Intent(c, MyActivity.class);
Expand Down
8 changes: 4 additions & 4 deletions demo/src/main/res/layout/item_jayne_hat.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/jayne_hat"
android:padding="@dimen/grid_2"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/jayne_hat"
android:padding="@dimen/grid_2" />
9 changes: 5 additions & 4 deletions demo/src/main/res/layout/item_list.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ListItem">
<TextView
style="@style/ListItemText"
android:id="@+id/list_item_text"/>
style="@style/ListItem">

<TextView
style="@style/ListItemText"
android:id="@+id/list_item_text" />
</LinearLayout>
Loading