arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-02 19:01:06 +00:00
Code Issues Releases Wiki Activity

Remove timezone from create calendar page.

Browse Source
This commit is contained in:
Tom Hacohen 2017-02-20 15:17:05 +00:00
parent a935e09287
commit 47a846bc2c
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java
View File

@ -18,18 +18,12 @@ import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Spinner;
import net.fortuna.ical4j.model.Calendar;
import net.fortuna.ical4j.model.TimeZone;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import at.bitfire.davdroid.R; import at.bitfire.davdroid.R;
import at.bitfire.davdroid.model.CollectionInfo; import at.bitfire.davdroid.model.CollectionInfo;
import at.bitfire.ical4android.DateUtils;
import yuku.ambilwarna.AmbilWarnaDialog; import yuku.ambilwarna.AmbilWarnaDialog;
public class CreateCalendarActivity extends AppCompatActivity { public class CreateCalendarActivity extends AppCompatActivity {
@ -62,19 +56,6 @@ public class CreateCalendarActivity extends AppCompatActivity {
}).show(); }).show();
} }
}); });
Spinner spinner = (Spinner) findViewById(R.id.time_zone);
String[] timeZones = TimeZone.getAvailableIDs();
spinner.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, timeZones));
// select system time zone
String defaultTimeZone = TimeZone.getDefault().getID();
for (int i = 0; i < timeZones.length; i++) {
if (timeZones[i].equals(defaultTimeZone)) {
spinner.setSelection(i);
break;
}
}
} }
@Override @Override
@ -98,8 +79,6 @@ public class CreateCalendarActivity extends AppCompatActivity {
boolean ok = true; boolean ok = true;
CollectionInfo info = new CollectionInfo(); CollectionInfo info = new CollectionInfo();
Spinner spinner;
EditText edit = (EditText) findViewById(R.id.display_name); EditText edit = (EditText) findViewById(R.id.display_name);
info.displayName = edit.getText().toString(); info.displayName = edit.getText().toString();
if (TextUtils.isEmpty(info.displayName)) { if (TextUtils.isEmpty(info.displayName)) {
@ -113,14 +92,6 @@ public class CreateCalendarActivity extends AppCompatActivity {
View view = findViewById(R.id.color); View view = findViewById(R.id.color);
info.color = ((ColorDrawable) view.getBackground()).getColor(); info.color = ((ColorDrawable) view.getBackground()).getColor();
spinner = (Spinner) findViewById(R.id.time_zone);
net.fortuna.ical4j.model.TimeZone tz = DateUtils.tzRegistry.getTimeZone((String) spinner.getSelectedItem());
if (tz != null) {
Calendar cal = new Calendar();
cal.getComponents().add(tz.getVTimeZone());
info.timeZone = cal.toString();
}
if (ok) { if (ok) {
info.type = CollectionInfo.Type.CALENDAR; info.type = CollectionInfo.Type.CALENDAR;
info.supportsVEVENT = true; info.supportsVEVENT = true;

10
app/src/main/res/layout/activity_create_calendar.xml
View File

@ -59,16 +59,6 @@
android:text="@string/create_collection_color"/> android:text="@string/create_collection_color"/>
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/create_calendar_time_zone"/>
<Spinner
android:id="@+id/time_zone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>