- added throw button to note_view_full

- ui layout modify
2016-07-01 17:51:52 +03:00 · 2016-07-01 17:51:52 +03:00 · fccbfe9346
parent a935dc7ef3
commit fccbfe9346
12 changed files with 43 additions and 49 deletions
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -5,7 +5,7 @@
      <GradleProjectSettings>
        <option name="distributionType" value="LOCAL" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.10" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
--- a/.idea/libraries/android_android_23.xml
+++ b/.idea/libraries/android_android_23.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="android-android-23">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/platforms/android-23/android.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/.idea/libraries/animated_vector_drawable_23_3_0.xml
+++ b/.idea/libraries/animated_vector_drawable_23_3_0.xml
@ -1,13 +1,13 @@
 <component name="libraryTable">
  <library name="animated-vector-drawable-23.3.0">
    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars/classes.jar!/" />
      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars/classes.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/libraries/appcompat_v7_23_3_0.xml
+++ b/.idea/libraries/appcompat_v7_23_3_0.xml
@ -4,11 +4,12 @@
      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/annotations.zip!/" />
    </ANNOTATIONS>
    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars/classes.jar!/" />
      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars/classes.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.3.0/appcompat-v7-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.3.0/appcompat-v7-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.3.0/appcompat-v7-23.3.0-sources.jar!/" />
    </SOURCES>
--- a/.idea/libraries/design_23_3_0.xml
+++ b/.idea/libraries/design_23_3_0.xml
@ -4,13 +4,13 @@
      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.3.0/annotations.zip!/" />
    </ANNOTATIONS>
    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.3.0/jars/classes.jar!/" />
      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.3.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.3.0/jars/classes.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/libraries/recyclerview_v7_23_3_0.xml
+++ b/.idea/libraries/recyclerview_v7_23_3_0.xml
@ -9,8 +9,8 @@
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/libraries/support_annotations_23_3_0.xml
+++ b/.idea/libraries/support_annotations_23_3_0.xml
@ -1,12 +1,12 @@
 <component name="libraryTable">
  <library name="support-annotations-23.3.0">
    <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0.jar!/" />
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/libraries/support_v4_23_3_0.xml
+++ b/.idea/libraries/support_v4_23_3_0.xml
@ -10,8 +10,8 @@
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/libraries/support_vector_drawable_23_3_0.xml
+++ b/.idea/libraries/support_vector_drawable_23_3_0.xml
@ -6,8 +6,8 @@
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
    </SOURCES>
  </library>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -3,8 +3,6 @@
  <component name="ProjectModuleManager">
    <modules>
      <module fileurl="file://$PROJECT_DIR$/TheSocialNotework-Android.iml" filepath="$PROJECT_DIR$/TheSocialNotework-Android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/TheSocialNotework-Android.iml" filepath="$PROJECT_DIR$/TheSocialNotework-Android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
    </modules>
  </component>
--- a/app/src/main/res/layout/note_view_full.xml
+++ b/app/src/main/res/layout/note_view_full.xml
@ -8,6 +8,18 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

+        <Switch
+            android:id="@+id/nvf_note_permission"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|top"
+            android:layout_marginTop="25dp"
+            android:checked="true"
+            android:showText="true"
+            android:text="Public"
+            android:textOff="@string/nvf_private_label"
+            android:textOn="@string/nvf_public_label" />
+
        <EditText
            android:id="@+id/nvf_note_title"
            android:layout_width="match_parent"
@ -23,33 +35,6 @@
            android:text="Title"
            android:textColor="#c5c4c4" />

-        <TextView
-            android:id="@+id/nvf_note_full_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|top"
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="25dp"
-            android:text="Note view" />
-
-        <Switch
-            android:id="@+id/nvf_note_permission"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|top"
-            android:layout_marginTop="25dp"
-            android:textOff="Public"
-            android:textOn="Private" />
-
-        <Button
-            android:id="@+id/nvf_note_submit_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right|top"
-            android:layout_marginRight="15dp"
-            android:layout_marginTop="15dp"
-            android:text="Note Me" />
-
        <EditText
            android:id="@+id/nvf_note_content"
            android:layout_width="match_parent"
@ -62,5 +47,21 @@
            android:text="Content"
            android:textColor="#c5c4c4" />

+        <Button
+            android:id="@+id/nvf_note_submit_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|top"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="150dp"
+            android:text="Note Me" />
+
+        <Button
+            android:id="@+id/nvf_note_cancel_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:text="Throw Me" />
+
    </FrameLayout>
 </LinearLayout>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -14,4 +14,7 @@
    completions."
  </string>
    <string name="title_activity_personal_space">PersonalSpaceActivity</string>
+    <string name="nvf_private_label">Private</string>
+    <string name="nvf_public_label">Public</string>
+
 </resources>