JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android

Browse source
This commit is contained in:
Aran Zaiger 2016-07-10 13:19:35 +03:00
commit 5e23dd9789
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
View file

@ -122,7 +122,8 @@ public class SettingsFragment extends Fragment implements View.OnClickListener,
break; break;
case R.id.btn_save: case R.id.btn_save:
user.updateUser(parent); if(txt_password.getText().length() > 3 && txt_email.getText().length() > 0) user.updateUser(parent);
else Toast.makeText(parent, "Password should be more than 4 chars long, valid email", Toast.LENGTH_LONG).show();
break; break;
} }
} }

14
app/src/main/res/layout/note_view_full.xml
View file

@ -12,7 +12,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="20dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/imageView10" android:id="@+id/imageView10"
android:src="@drawable/new_note" android:src="@drawable/new_note"
@ -49,7 +49,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:id="@+id/scrollView" android:id="@+id/scrollView"
android:layout_weight="0.5" android:layout_weight="0.55"
android:layout_marginTop="7dp"> android:layout_marginTop="7dp">
<EditText <EditText
@ -71,7 +71,7 @@
android:id="@+id/nvf_note_permission" android:id="@+id/nvf_note_permission"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="25dp" android:layout_marginTop="0dp"
android:checked="true" android:checked="true"
android:text="@string/nvf_public_label" android:text="@string/nvf_public_label"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
@ -87,7 +87,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/note_me" android:text="@string/note_me"
android:layout_margin="15dp" android:layout_margin="5dp"
android:drawableLeft="@android:drawable/ic_menu_send" android:drawableLeft="@android:drawable/ic_menu_send"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:textColor="#ffffff" android:textColor="#ffffff"
@ -99,8 +99,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/throw_me" android:text="@string/throw_me"
android:layout_marginTop="15dp" android:drawableLeft="@android:drawable/ic_menu_delete"
android:drawableLeft="@android:drawable/ic_menu_delete" /> android:layout_margin="5dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -108,4 +108,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>