From bfd853814c22f42d4d5a05124d97543754beb23d Mon Sep 17 00:00:00 2001
From: Felix Prahl-Kamps <felixpk@outlook.de>
Date: Tue, 5 Jun 2018 13:32:14 +0200
Subject: [PATCH] ~ExternalOrgViewHolder, back to android studio

---
 .idea/assetWizardSettings.xml                   |   4 ++--
 .idea/caches/build_file_checksums.ser           | Bin 534 -> 534 bytes
 .idea/codeStyles/codeStyleConfig.xml            |   5 -----
 .idea/misc.xml                                  |   2 +-
 .idea/modules.xml                               |   2 +-
 .idea/vcs.xml                                   |   6 ++++++
 app/src/main/res/drawable/ic_info_white.xml     |   5 +++++
 app/src/main/res/layout/activity_main.xml       |   2 +-
 app/src/main/res/layout/activity_sync.xml       |   2 --
 app/src/main/res/layout/content_main.xml        |   6 ------
 app/src/main/res/layout/content_sync.xml        |  12 ------------
 app/src/main/res/layout/view_holder_ext_org.xml |   8 ++++++++
 12 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 app/src/main/res/drawable/ic_info_white.xml
 delete mode 100644 app/src/main/res/layout/content_main.xml
 delete mode 100644 app/src/main/res/layout/content_sync.xml

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 9394d23..d97d966 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -18,7 +18,7 @@
                                 <PersistentState>
                                   <option name="values">
                                     <map>
-                                      <entry key="url" value="jar:file:/opt/android-studio/plugins/android/lib/android.jar!/images/material_design_icons/navigation/ic_arrow_back_black_24dp.xml" />
+                                      <entry key="url" value="jar:file:/opt/android-studio/plugins/android/lib/android.jar!/images/material_design_icons/action/ic_info_black_24dp.xml" />
                                     </map>
                                   </option>
                                 </PersistentState>
@@ -29,7 +29,7 @@
                         <option name="values">
                           <map>
                             <entry key="color" value="ffffff" />
-                            <entry key="outputName" value="ic_arrow_back_white" />
+                            <entry key="outputName" value="ic_info_white" />
                             <entry key="sourceFile" value="$USER_HOME$" />
                           </map>
                         </option>
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 0482d0880919364af84655fcf7f3ee8f996bfb8d..76bfc68550dfc6d0fe9b5913c457b1b9d040c9d4 100644
GIT binary patch
delta 36
ucmV+<0NekT1eOGlm;}$OL6fnZ4gnCX?AzwX_q=JmvJ%QR6^2-ox&d50`4Mvf

delta 36
ucmV+<0NekT1eOGlm;{ZYxZ<&#4gnAjL1E$Jq2Wt%1Enq9-U8{9x&d4z8W3&(

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..99202cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7122c9b..24ae196 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/MISPAuthentificator.iml" filepath="$PROJECT_DIR$/MISPAuthentificator.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/misp-auth.iml" filepath="$PROJECT_DIR$/misp-auth.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_white.xml b/app/src/main/res/drawable/ic_info_white.xml
new file mode 100644
index 0000000..7be0147
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d518aa0..6cf2f56 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -68,11 +68,11 @@
         app:srcCompat="@drawable/ic_add_white" />
 
     <android.support.design.widget.FloatingActionButton
-        android:visibility="gone"
         android:id="@+id/fab_sync"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="100dp"
+        android:visibility="gone"
         app:fabSize="mini"
         app:layout_anchor="@+id/fab_add"
         app:layout_anchorGravity="top|center_horizontal"
diff --git a/app/src/main/res/layout/activity_sync.xml b/app/src/main/res/layout/activity_sync.xml
index 33b2708..f7d3453 100644
--- a/app/src/main/res/layout/activity_sync.xml
+++ b/app/src/main/res/layout/activity_sync.xml
@@ -65,8 +65,6 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_sync" />
-
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
deleted file mode 100644
index d8fb324..0000000
--- a/app/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_sync.xml b/app/src/main/res/layout/content_sync.xml
deleted file mode 100644
index 473d6d1..0000000
--- a/app/src/main/res/layout/content_sync.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".activity.SyncActivity"
-    tools:showIn="@layout/activity_sync"
-    android:background="@drawable/background_rounded_main">
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_holder_ext_org.xml b/app/src/main/res/layout/view_holder_ext_org.xml
index d1705a9..1006af7 100644
--- a/app/src/main/res/layout/view_holder_ext_org.xml
+++ b/app/src/main/res/layout/view_holder_ext_org.xml
@@ -7,6 +7,7 @@
 
     <TextView
         android:id="@+id/ext_org_title"
+        android:layout_marginEnd="40dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -22,4 +23,11 @@
         android:text="http://192.168.178.200"
         android:textSize="15sp"/>
 
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/ic_info_white"
+        android:tint="@color/colorPrimary"
+        android:layout_alignParentEnd="true" />
+
 </RelativeLayout>
\ No newline at end of file