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 10:22:43 +03:00
commit 9c29617b00
3 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/ExploreFragment.java
View file

@ -92,7 +92,6 @@ public class ExploreFragment extends Fragment {
dateFilter.setOnClickListener(new View.OnClickListener() { dateFilter.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// Log.d(TAG, "" + v.getId());
if (dateFilterIsVisible) { if (dateFilterIsVisible) {
dateFilterIsVisible = false; dateFilterIsVisible = false;
exploreFilters.setVisibility(View.GONE); exploreFilters.setVisibility(View.GONE);

2
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
View file

@ -498,8 +498,6 @@ public class PersonalFragment extends Fragment {
}); });
} }
} }

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

@ -42,16 +42,15 @@
android:editable="true" android:editable="true"
android:elegantTextHeight="false" android:elegantTextHeight="false"
android:maxLines="1" android:maxLines="1"
android:textColor="#c5c4c4" android:hint="Title"
android:hint="Title" android:layout_marginTop="10dp" />
android:layout_marginTop="15dp" />
<ScrollView <ScrollView
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.5"
android:layout_marginTop="10dp"> android:layout_marginTop="7dp">
<EditText <EditText
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -63,42 +62,49 @@
android:layout_weight="0.24" /> android:layout_weight="0.24" />
</ScrollView> </ScrollView>
<Switch
android:id="@+id/nvf_note_permission"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:checked="true"
android:text="@string/nvf_public_label"
android:layout_gravity="center_horizontal" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_horizontal">
<Button <Switch
android:id="@+id/nvf_note_submit_btn" 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:text="@string/note_me" android:layout_marginTop="25dp"
android:layout_margin="15dp" android:checked="true"
android:drawableLeft="@android:drawable/ic_menu_send" android:text="@string/nvf_public_label"
android:background="@color/colorPrimary" android:layout_gravity="center_horizontal" />
android:textColor="#ffffff"
android:paddingLeft="5dp"
android:paddingRight="5dp" />
<Button <LinearLayout
android:id="@+id/nvf_note_cancel_btn" android:orientation="horizontal"
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:layout_gravity="center_horizontal">
android:layout_marginTop="15dp"
android:drawableLeft="@android:drawable/ic_menu_delete" /> <Button
android:id="@+id/nvf_note_submit_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/note_me"
android:layout_margin="15dp"
android:drawableLeft="@android:drawable/ic_menu_send"
android:background="@color/colorPrimary"
android:textColor="#ffffff"
android:paddingLeft="5dp"
android:paddingRight="5dp" />
<Button
android:id="@+id/nvf_note_cancel_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/throw_me"
android:layout_marginTop="15dp"
android:drawableLeft="@android:drawable/ic_menu_delete" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>