Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4baa880 authored by Niedermann IT-Dienstleistungen's avatar Niedermann IT-Dienstleistungen Committed by Niedermann IT-Dienstleistungen
Browse files

#360 Drawer header should show account name 

- Fix layout
- Clicking on the account name opens now settings
parent 81c4ae33

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -371,8 +371,16 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 


        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        String username = preferences.getString(SettingsActivity.SETTINGS_USERNAME, SettingsActivity.DEFAULT_SETTINGS);

        String url = preferences.getString(SettingsActivity.SETTINGS_URL, SettingsActivity.DEFAULT_SETTINGS);

        this.account.setText(username + "@" + url);

        String url = preferences.getString(SettingsActivity.SETTINGS_URL, SettingsActivity.DEFAULT_SETTINGS).replace("https://", "").replace("http://", "");

        this.account.setText(username + "@" + url.substring(0, url.length() - 1));

        final NotesListViewActivity that = this;

        this.account.setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                Intent settingsIntent = new Intent(that, SettingsActivity.class);

                startActivityForResult(settingsIntent, server_settings);

            }

        });



        adapterMenu.setItems(itemsMenu);

        listNavigationMenu.setAdapter(adapterMenu);

app/src/main/res/layout/drawer_layout.xml

+6 −6
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:paddingTop="24dp"

                        android:layout_gravity="center_vertical"

                        android:src="@mipmap/ic_launcher"

                        android:contentDescription="@string/app_name" />
@@ -47,22 +48,21 @@ 
                    <android.support.v7.widget.LinearLayoutCompat

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_vertical"

                        android:paddingLeft="12dp"

                        android:paddingStart="12dp"

                        android:paddingTop="24dp"

                        android:orientation="vertical">

                    <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:paddingTop="24dp"

                        android:paddingLeft="12dp"

                        android:layout_gravity="center_vertical"

                        android:text="@string/app_name"

                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />



                    <TextView

                        android:id="@+id/account"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:paddingLeft="12dp"

                        android:layout_gravity="center_vertical"/>

                        android:layout_height="wrap_content"/>

                    </android.support.v7.widget.LinearLayoutCompat>

                </LinearLayout>