msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Changed OK into Save

Browse Source 
Fixed #22
pull/12/merge
M66B 7 years ago
parent 3313e944ed
commit 7052639d48
6 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/java/eu/faircode/email/FragmentAccount.java
Unescape View File

@ -66,7 +66,7 @@ public class FragmentAccount extends FragmentEx {
private TextInputLayout tilPassword; private TextInputLayout tilPassword;
private CheckBox cbSynchronize; private CheckBox cbSynchronize;
private CheckBox cbPrimary; private CheckBox cbPrimary;
private Button btnOk; private Button btnSave;
private ProgressBar pbCheck; private ProgressBar pbCheck;
// TODO: loading spinner // TODO: loading spinner
@ -102,7 +102,7 @@ public class FragmentAccount extends FragmentEx {
tilPassword = view.findViewById(R.id.tilPassword); tilPassword = view.findViewById(R.id.tilPassword);
cbSynchronize = view.findViewById(R.id.cbSynchronize); cbSynchronize = view.findViewById(R.id.cbSynchronize);
cbPrimary = view.findViewById(R.id.cbPrimary); cbPrimary = view.findViewById(R.id.cbPrimary);
btnOk = view.findViewById(R.id.btnOk); btnSave = view.findViewById(R.id.btnSave);
pbCheck = view.findViewById(R.id.pbCheck); pbCheck = view.findViewById(R.id.pbCheck);
// Wire controls // Wire controls
@ -136,10 +136,10 @@ public class FragmentAccount extends FragmentEx {
} }
}); });
btnOk.setOnClickListener(new View.OnClickListener() { btnSave.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
btnOk.setEnabled(false); btnSave.setEnabled(false);
pbCheck.setVisibility(View.VISIBLE); pbCheck.setVisibility(View.VISIBLE);
Bundle args = new Bundle(); Bundle args = new Bundle();
@ -334,7 +334,7 @@ public class FragmentAccount extends FragmentEx {
public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) { public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) {
getLoaderManager().destroyLoader(loader.getId()); getLoaderManager().destroyLoader(loader.getId());
btnOk.setEnabled(true); btnSave.setEnabled(true);
pbCheck.setVisibility(View.GONE); pbCheck.setVisibility(View.GONE);
if (ex == null) if (ex == null)

10
app/src/main/java/eu/faircode/email/FragmentFolder.java
Unescape View File

@ -42,7 +42,7 @@ import android.widget.Toast;
public class FragmentFolder extends FragmentEx { public class FragmentFolder extends FragmentEx {
private CheckBox cbSynchronize; private CheckBox cbSynchronize;
private EditText etAfter; private EditText etAfter;
private Button btnOk; private Button btnSave;
private ProgressBar pbSave; private ProgressBar pbSave;
private ProgressBar pbWait; private ProgressBar pbWait;
private Group grpReady; private Group grpReady;
@ -62,14 +62,14 @@ public class FragmentFolder extends FragmentEx {
cbSynchronize = view.findViewById(R.id.cbSynchronize); cbSynchronize = view.findViewById(R.id.cbSynchronize);
etAfter = view.findViewById(R.id.etAfter); etAfter = view.findViewById(R.id.etAfter);
pbSave = view.findViewById(R.id.pbSave); pbSave = view.findViewById(R.id.pbSave);
btnOk = view.findViewById(R.id.btnOk); btnSave = view.findViewById(R.id.btnSave);
pbWait = view.findViewById(R.id.pbWait); pbWait = view.findViewById(R.id.pbWait);
grpReady = view.findViewById(R.id.grpReady); grpReady = view.findViewById(R.id.grpReady);
btnOk.setOnClickListener(new View.OnClickListener() { btnSave.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
btnOk.setEnabled(false); btnSave.setEnabled(false);
pbSave.setVisibility(View.VISIBLE); pbSave.setVisibility(View.VISIBLE);
Bundle args = new Bundle(); Bundle args = new Bundle();
@ -155,7 +155,7 @@ public class FragmentFolder extends FragmentEx {
public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) { public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) {
getLoaderManager().destroyLoader(loader.getId()); getLoaderManager().destroyLoader(loader.getId());
btnOk.setEnabled(true); btnSave.setEnabled(true);
pbSave.setVisibility(View.GONE); pbSave.setVisibility(View.GONE);
if (ex == null) if (ex == null)

10
app/src/main/java/eu/faircode/email/FragmentIdentity.java
Unescape View File

@ -66,7 +66,7 @@ public class FragmentIdentity extends FragmentEx {
private TextInputLayout tilPassword; private TextInputLayout tilPassword;
private CheckBox cbSynchronize; private CheckBox cbSynchronize;
private CheckBox cbPrimary; private CheckBox cbPrimary;
private Button btnOk; private Button btnSave;
private ProgressBar pbCheck; private ProgressBar pbCheck;
// TODO: loading spinner // TODO: loading spinner
@ -97,7 +97,7 @@ public class FragmentIdentity extends FragmentEx {
tilPassword = view.findViewById(R.id.tilPassword); tilPassword = view.findViewById(R.id.tilPassword);
cbSynchronize = view.findViewById(R.id.cbSynchronize); cbSynchronize = view.findViewById(R.id.cbSynchronize);
cbPrimary = view.findViewById(R.id.cbPrimary); cbPrimary = view.findViewById(R.id.cbPrimary);
btnOk = view.findViewById(R.id.btnOk); btnSave = view.findViewById(R.id.btnSave);
pbCheck = view.findViewById(R.id.pbCheck); pbCheck = view.findViewById(R.id.pbCheck);
// Wire controls // Wire controls
@ -153,10 +153,10 @@ public class FragmentIdentity extends FragmentEx {
} }
}); });
btnOk.setOnClickListener(new View.OnClickListener() { btnSave.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
btnOk.setEnabled(false); btnSave.setEnabled(false);
pbCheck.setVisibility(View.VISIBLE); pbCheck.setVisibility(View.VISIBLE);
Bundle args = new Bundle(); Bundle args = new Bundle();
@ -284,7 +284,7 @@ public class FragmentIdentity extends FragmentEx {
public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) { public void onLoadFinished(@NonNull Loader<Throwable> loader, Throwable ex) {
getLoaderManager().destroyLoader(loader.getId()); getLoaderManager().destroyLoader(loader.getId());
btnOk.setEnabled(true); btnSave.setEnabled(true);
pbCheck.setVisibility(View.GONE); pbCheck.setVisibility(View.GONE);
if (ex == null) if (ex == null)

12
app/src/main/res/layout/fragment_account.xml
Unescape View File

@ -177,11 +177,11 @@
app:layout_constraintTop_toBottomOf="@id/cbSynchronize" /> app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
<Button <Button
android:id="@+id/btnOk" android:id="@+id/btnSave"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@android:string/ok" android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbPrimary" /> app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
@ -192,14 +192,14 @@
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:indeterminate="true" android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="@id/btnOk" app:layout_constraintBottom_toBottomOf="@id/btnSave"
app:layout_constraintStart_toEndOf="@id/btnOk" app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnOk" /> app:layout_constraintTop_toTopOf="@id/btnSave" />
<android.support.constraint.Group <android.support.constraint.Group
android:id="@+id/grpReady" android:id="@+id/grpReady"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids="spProvider,etName,etHost,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnOk" /> app:constraint_referenced_ids="spProvider,etName,etHost,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnSave" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</ScrollView> </ScrollView>

12
app/src/main/res/layout/fragment_folder.xml
Unescape View File

@ -45,11 +45,11 @@
app:layout_constraintTop_toBottomOf="@id/tvAfter" /> app:layout_constraintTop_toBottomOf="@id/tvAfter" />
<Button <Button
android:id="@+id/btnOk" android:id="@+id/btnSave"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@android:string/ok" android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etAfter" /> app:layout_constraintTop_toBottomOf="@id/etAfter" />
@ -60,9 +60,9 @@
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:indeterminate="true" android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="@id/btnOk" app:layout_constraintBottom_toBottomOf="@id/btnSave"
app:layout_constraintStart_toEndOf="@id/btnOk" app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnOk" /> app:layout_constraintTop_toTopOf="@id/btnSave" />
<ProgressBar <ProgressBar
android:id="@+id/pbWait" android:id="@+id/pbWait"
@ -79,6 +79,6 @@
android:id="@+id/grpReady" android:id="@+id/grpReady"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids="cbSynchronize,tvAfter,etAfter,btnOk" /> app:constraint_referenced_ids="cbSynchronize,tvAfter,etAfter,btnSave" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</ScrollView> </ScrollView>

12
app/src/main/res/layout/fragment_identity.xml
Unescape View File

@ -229,11 +229,11 @@
app:layout_constraintTop_toBottomOf="@id/cbSynchronize" /> app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
<Button <Button
android:id="@+id/btnOk" android:id="@+id/btnSave"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@android:string/ok" android:text="@string/title_save"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbPrimary" /> app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
@ -244,14 +244,14 @@
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:indeterminate="true" android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="@id/btnOk" app:layout_constraintBottom_toBottomOf="@id/btnSave"
app:layout_constraintStart_toEndOf="@id/btnOk" app:layout_constraintStart_toEndOf="@id/btnSave"
app:layout_constraintTop_toTopOf="@id/btnOk" /> app:layout_constraintTop_toTopOf="@id/btnSave" />
<android.support.constraint.Group <android.support.constraint.Group
android:id="@+id/grpReady" android:id="@+id/grpReady"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids="etName,etEmail,spProvider,etHost,cbStartTls,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnOk" /> app:constraint_referenced_ids="etName,etEmail,spProvider,etHost,cbStartTls,etPort,etUser,tilPassword,cbPrimary,cbSynchronize,btnSave" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</ScrollView> </ScrollView>
Write Preview
Loading…
Cancel
Save