archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add translucent dialog

Browse Source
pull/384/head
Alex Baker 9 years ago
parent 66dbf832b8
commit 1111452930
8 changed files with 93 additions and 104 deletions
Show Stats Download Patch File Download Diff File

4
src/googleplay/AndroidManifest.xml
Unescape Escape View File

@ -45,7 +45,7 @@
<activity
android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name="com.todoroo.astrid.gtasks.GtasksPreferences"
@ -54,7 +54,7 @@
<activity
android:name=".activities.ClearGtaskDataActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<service
android:name=".scheduling.GtasksBackgroundService"

40
src/main/AndroidManifest.xml
Unescape Escape View File

@ -113,20 +113,20 @@
<activity
android:name=".activities.SortActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.FilterSelectionActivity"
android:exported="true"
android:theme="@style/TasksDialog" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.AddAttachmentActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.CameraActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<!-- Activity that displays task list -->
<activity
@ -154,7 +154,7 @@
<!-- Activity for selecting Android shortcut -->
<activity
android:name=".widget.ShortcutConfigActivity"
android:theme="@style/TasksDialog">
android:theme="@style/TranslucentDialog">
android:label="@string/FSA_label">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
@ -199,7 +199,7 @@
<!-- Activity that configures widget -->
<activity
android:name=".widget.WidgetConfigActivity"
android:theme="@style/TasksDialog">
android:theme="@style/TranslucentDialog">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
@ -301,21 +301,21 @@
android:excludeFromRecents="true"
android:launchMode="singleTask"
android:taskAffinity=""
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".reminders.SnoozeActivity"
android:excludeFromRecents="true"
android:launchMode="singleTask"
android:taskAffinity=""
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".reminders.NotificationActivity"
android:excludeFromRecents="true"
android:launchMode="singleTask"
android:taskAffinity=""
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<!-- tags -->
@ -361,7 +361,7 @@
<activity
android:name=".activities.CalendarSelectionActivity"
android:theme="@style/Theme.AppCompat.Dialog" />
android:theme="@style/TranslucentDialog" />
<activity
android:name="com.todoroo.astrid.gcal.CalendarReminderActivity"
@ -377,31 +377,31 @@
<activity
android:name=".activities.ClearAllDataActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.ResetPreferencesActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.PurgeDeletedActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.DeleteCompletedActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.DeleteCompletedEventsActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name=".activities.DeleteAllCalendarEventsActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<!-- backup -->
<activity
android:name="org.tasks.activities.ExportTaskActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<activity
android:name="org.tasks.activities.ImportTaskActivity"
android:theme="@style/DialogBase" />
android:theme="@style/TranslucentDialog" />
<!-- premium -->
<activity
@ -422,7 +422,7 @@
<activity
android:name=".files.FileExplore"
android:theme="@style/DialogBase"/>
android:theme="@style/TranslucentDialog"/>
<receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener">
<intent-filter>
@ -439,7 +439,7 @@
<activity
android:name=".voice.VoiceCommandActivity"
android:theme="@style/DialogBase">
android:theme="@style/TranslucentDialog">
<intent-filter>
<action android:name="com.google.android.gm.action.AUTO_SEND"/>

5
src/main/java/org/tasks/activities/CalendarSelectionActivity.java
Unescape Escape View File

@ -6,11 +6,9 @@ import android.content.pm.PackageManager;
import android.os.Bundle;
import org.tasks.calendars.AndroidCalendar;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.preferences.ActivityPermissionRequestor;
import org.tasks.preferences.ActivityPreferences;
import org.tasks.preferences.PermissionRequestor;
import javax.inject.Inject;
@ -24,14 +22,11 @@ public class CalendarSelectionActivity extends InjectingAppCompatActivity implem
public static final String EXTRA_SHOW_NONE = "extra_show_none";
@Inject ActivityPermissionRequestor permissionRequestor;
@Inject ActivityPreferences preferences;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
preferences.applyTheme();
if (permissionRequestor.requestCalendarPermissions()) {
showDialog();
}

7
src/main/java/org/tasks/activities/CalendarSelectionDialog.java
Unescape Escape View File

@ -54,13 +54,10 @@ public class CalendarSelectionDialog extends InjectingDialogFragment {
}
});
ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
android.R.layout.simple_list_item_1, calendarNames);
AlertDialog.Builder builder = dialogBuilder.newDialog()
.setSingleChoiceItems(adapter, 0, new DialogInterface.OnClickListener() {
.setItems(calendarNames.toArray(new String[calendarNames.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, final int which) {
public void onClick(DialogInterface dialog, int which) {
handler.selectedCalendar(calendars.get(which));
dialog.dismiss();
}

4
src/main/java/org/tasks/activities/SortActivity.java
Unescape Escape View File

@ -12,7 +12,6 @@ import org.tasks.R;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.preferences.ActivityPreferences;
import org.tasks.preferences.Preferences;
import java.util.ArrayList;
@ -30,7 +29,6 @@ public class SortActivity extends InjectingAppCompatActivity {
@Inject Preferences preferences;
@Inject DialogBuilder dialogBuilder;
@Inject ActivityPreferences activityPreferences;
private boolean manualEnabled;
private AlertDialog alertDialog;
@ -40,8 +38,6 @@ public class SortActivity extends InjectingAppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
activityPreferences.applyDialogTheme();
manualEnabled = getIntent().getBooleanExtra(EXTRA_MANUAL_ENABLED, false);
List<String> items = new ArrayList<>();

64
src/main/res/layout/aac_record_activity.xml
Unescape Escape View File

@ -9,6 +9,66 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
<include layout="@layout/astrid_record_audio_view"/>
<LinearLayout
android:id="@+id/reminder_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:orientation="vertical"
android:background="@drawable/reminder_dialog_background">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="5dip"
android:layout_marginRight="5dip"
android:layout_marginBottom="10dip"
android:layout_marginLeft="10dip">
<TextView
android:id="@+id/reminder_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dip"
android:textSize="24sp"
android:textColor="@android:color/white"
android:layout_weight="1"
android:text="@string/audio_recording_title" />
<ImageView
android:id="@+id/dismiss"
android:layout_width="25dip"
android:layout_height="25dip"
android:scaleType="fitCenter"
android:tint="@android:color/white"
android:src="@drawable/ic_close_24dp" />
</LinearLayout>
<Chronometer
android:id="@+id/timer"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center" />
<TextView
android:id="@+id/stop_recording"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:background="@color/overdue"
android:textSize="24sp"
android:gravity="center"
android:text="@string/audio_stop_recording" />
</LinearLayout>
</LinearLayout>

66
src/main/res/layout/astrid_record_audio_view.xml
Unescape Escape View File

@ -1,66 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/reminder_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:orientation="vertical"
android:background="@drawable/reminder_dialog_background">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="5dip"
android:layout_marginRight="5dip"
android:layout_marginBottom="10dip"
android:layout_marginLeft="10dip">
<TextView
android:id="@+id/reminder_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dip"
android:textSize="24sp"
android:textColor="@android:color/white"
android:layout_weight="1"
android:text="@string/audio_recording_title"/>
<ImageView
android:id="@+id/dismiss"
android:layout_width="25dip"
android:layout_height="25dip"
android:scaleType="fitCenter"
android:tint="@android:color/white"
android:src="@drawable/ic_close_24dp"/>
</LinearLayout>
<Chronometer
android:id="@+id/timer"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:textSize="24sp"
android:gravity="center"/>
<TextView
android:id="@+id/stop_recording"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"
android:layout_marginBottom="10dip"
android:textColor="@android:color/white"
android:background="@color/overdue"
android:textSize="24sp"
android:gravity="center"
android:text="@string/audio_stop_recording"/>
</LinearLayout>

7
src/main/res/values/styles.xml
Unescape Escape View File

@ -11,6 +11,13 @@
<item name="android:textColor">#fff</item>
</style>
<style name="TranslucentDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
</style>
<style name="Toolbar" parent="@style/Widget.AppCompat.Toolbar" />
<style name="TextBoxText">

Write Preview
Loading…
Cancel
Save