Remove android.support.widget components from the sharewith view. Waiting for introdu...

diff --git a/build.gradle b/build.gradle
index 8eee848..d96997a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     compile 'com.android.support:support-v4:22.2.1'
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.android.support:appcompat-v7:22.2.1'
     compile 'com.android.support:support-v4:22.2.1'
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.android.support:appcompat-v7:22.2.1'

-    compile 'com.android.support:design:22.2.1'

 }
 
 android {
 }
 
 android {

diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index e9be9f6..772b941 100644 (file)
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -16,29 +16,17 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<android.support.design.widget.CoordinatorLayout
+<LinearLayout

     xmlns:android="http://schemas.android.com/apk/res/android"
     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"
     tools:context="com.owncloud.android.ui.activity.ShareActivity">
 
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.owncloud.android.ui.activity.ShareActivity">
 

-    <android.support.design.widget.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent" android:theme="@style/Theme.ownCloud.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar android:id="@+id/toolbar"
-            android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/Theme.ownCloud.PopupOverlay" />
-
-    </android.support.design.widget.AppBarLayout>
-

     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/share_fragment_container">
     </FrameLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/share_fragment_container">
     </FrameLayout>
 

-</android.support.design.widget.CoordinatorLayout>
+</LinearLayout>

diff --git a/res/layout/share_file_layout.xml b/res/layout/share_file_layout.xml
index fc2832b..cfbed19 100644 (file)
--- a/res/layout/share_file_layout.xml
+++ b/res/layout/share_file_layout.xml
@@ -93,16 +93,14 @@
             android:text="@string/share_no_users"
             android:padding="12dp" />
 
             android:text="@string/share_no_users"
             android:padding="12dp" />
 

-        <android.support.design.widget.FloatingActionButton
+        <android.support.v7.widget.AppCompatButton

             android:id="@+id/addUserButton"
             android:id="@+id/addUserButton"

-            android:layout_width="wrap_content"
+            style="@style/ownCloud.Button"
+            android:layout_width="match_parent"

             android:layout_height="wrap_content"
             android:layout_height="wrap_content"

-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:src="@android:drawable/ic_input_add"
-            android:contentDescription="shareAddUserButton"
-            app:backgroundTint="@color/actionbar_start_color"
-            app:rippleColor="@color/background_color" />
+            android:layout_gravity="center_horizontal"
+            android:text="@string/share_add_user_or_group"
+            android:contentDescription="shareAddUserButton"/>

 
     </LinearLayout>
 </FrameLayout>
 
     </LinearLayout>
 </FrameLayout>

diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index 674ceef..8345918 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -53,8 +53,6 @@ public class ShareActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.share_activity);
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.share_activity);

-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);

 
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 
 
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index b780e78..c0626cc 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -25,11 +25,11 @@ import android.app.Activity;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;

-import android.support.design.widget.FloatingActionButton;

 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

+import android.widget.Button;

 import android.widget.ImageView;
 import android.widget.TextView;
 
 import android.widget.ImageView;
 import android.widget.TextView;
 


@@ -121,7 +121,7 @@ public class ShareFileFragment extends Fragment {
         }
 
         //  Add User Button
         }
 
         //  Add User Button

-        FloatingActionButton addUserGroupButton = (FloatingActionButton)
+        Button addUserGroupButton = (Button)

                 view.findViewById(R.id.addUserButton);
         addUserGroupButton.setOnClickListener(new View.OnClickListener() {
             @Override
                 view.findViewById(R.id.addUserButton);
         addUserGroupButton.setOnClickListener(new View.OnClickListener() {
             @Override