Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
This commit is contained in:
commit
9c29617b00
3 changed files with 38 additions and 35 deletions
|
@ -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);
|
||||||
|
|
|
@ -498,8 +498,6 @@ public class PersonalFragment extends Fragment {
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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="15dp" />
|
android:layout_marginTop="10dp" />
|
||||||
|
|
||||||
<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,6 +62,11 @@
|
||||||
android:layout_weight="0.24" />
|
android:layout_weight="0.24" />
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<Switch
|
<Switch
|
||||||
android:id="@+id/nvf_note_permission"
|
android:id="@+id/nvf_note_permission"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -101,5 +105,7 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
Loading…
Reference in a new issue