mirror of
https://github.com/gsantner/dandelion
synced 2025-12-09 22:01:17 +01:00
Refactor layout & menu files, dialogs
This commit is contained in:
Gregor Santner
parent
280f5ab1c3
commit
234335e696
18 changed files with 43 additions and 109 deletions
|
|
@ -9,7 +9,7 @@
|
|||
tools:openDrawer="start">
|
||||
|
||||
<include
|
||||
layout="@layout/app_bar_main"
|
||||
layout="@layout/main__app_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:fitsSystemWindows="true"
|
||||
app:headerLayout="@layout/main_nav_header"
|
||||
app:menu="@menu/navdrawer_main" />
|
||||
app:headerLayout="@layout/main__nav_header"
|
||||
app:menu="@menu/main__navdrawer" />
|
||||
|
||||
</android.support.v4.widget.DrawerLayout>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<include layout="@layout/content_main" />
|
||||
<include layout="@layout/main__content" />
|
||||
|
||||
<com.getbase.floatingactionbutton.FloatingActionsMenu
|
||||
android:id="@+id/fab_menubutton"
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
tools:context=".activity.MainActivity"
|
||||
tools:showIn="@layout/app_bar_main">
|
||||
tools:showIn="@layout/main__app_bar">
|
||||
|
||||
<android.support.v4.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipe"
|
||||
|
|
@ -15,28 +15,28 @@
|
|||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_marginTop="32dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/navheader_user_image"
|
||||
android:layout_gravity="center"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_width="@android:dimen/notification_large_icon_width"
|
||||
android:layout_height="@android:dimen/notification_large_icon_height"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="@dimen/activity_horizontal_margin"
|
||||
android:layout_marginStart="@dimen/activity_horizontal_margin"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_launcher" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/navheader_title"
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
tools:showIn="@layout/podselection_activity">
|
||||
tools:showIn="@layout/podselection__activity">
|
||||
|
||||
<ListView
|
||||
android:id="@+id/podselection__listpods"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
<menu 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"
|
||||
tools:context="com.github.dfa.diaspora_android.activity.MainActivity">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_exit"
|
||||
android:icon="@drawable/ic_sync_white_24dp"
|
||||
android:title="@string/exit_app"
|
||||
app:showAsAction="never" />
|
||||
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/exit_app"-->
|
||||
<!--android:title="@string/exit_app"-->
|
||||
<!--android:orderInCategory="110"-->
|
||||
<!--android:icon="@drawable/ic_exit_to_app_white_24dp"-->
|
||||
<!--app:showAsAction="always" />-->
|
||||
|
||||
|
||||
</menu>
|
||||
|
|
@ -13,8 +13,6 @@
|
|||
<string name="confirmation">Bestätigung</string>
|
||||
<string name="confirm_pod">Möchtest du wirklich \nhttps://%1$s\nals deinen Diaspora Pod auswählen?</string>
|
||||
<string name="confirm_exit">Möchtest du die App verlassen?</string>
|
||||
<string name="yes">OK</string>
|
||||
<string name="no">NEIN</string>
|
||||
<string name="change_pod_warning">Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Pod wechseln?</string>
|
||||
|
||||
<string name="permissions_screenshot">Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bildschirmfoto
|
||||
|
|
@ -130,6 +128,7 @@
|
|||
<string name="license_text"><b>Beteiligte:</b><br>
|
||||
|
||||
• gsantner https://gsantner.github.io<br>
|
||||
• martinchodev https://github.com/martinchodev<br>
|
||||
• scoute-dich https://github.com/scoute-dich<br> <br>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -145,8 +144,7 @@ GNU General Public License for more details.
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see http://www.gnu.org/licenses.<br> <br>
|
||||
|
||||
<i>Die App ist ein Fork von \"DiasporaNativeWebApp\"
|
||||
von \"martinchodev\". Die Bilder des Startbildschirms können auf Flickr gefunden werden:
|
||||
<i>Die Bilder des Startbildschirms können auf Flickr gefunden werden:
|
||||
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
|
||||
Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.</i></string>
|
||||
<string name="fab2_title_person">Suche nach Personen …</string>
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@
|
|||
<string name="confirmation">Confirmation</string>
|
||||
<string name="confirm_pod">Do you really want to use\nhttps://%1$s\nas your Diaspora Pod?</string>
|
||||
<string name="confirm_exit">Do you want to exit?</string>
|
||||
<string name="yes">YES</string>
|
||||
<string name="no">NO</string>
|
||||
<string name="change_pod_warning">This will erase all cookies and session data. Do you really want to change pods?</string>
|
||||
<string name="new_post">D* New message</string>
|
||||
<string name="new_post1">D* Text only</string>
|
||||
|
|
@ -170,10 +168,11 @@
|
|||
• implemented swipe to refresh
|
||||
</string>
|
||||
|
||||
<string name="license_title" translatable="false">Copyright © 2016</string>
|
||||
<string name="license_text"><b>Contributors:</b><br>
|
||||
<string name="license_title" translatable="false">Copyright © 2015–2016</string>
|
||||
<string name="license_text"><b>Main Contributors:</b><br>
|
||||
|
||||
• gsantner https://gsantner.github.io<br>
|
||||
• martinchodev https://github.com/martinchodev<br>
|
||||
• scoute-dich https://github.com/scoute-dich<br> <br>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -189,8 +188,7 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see http://www.gnu.org/licenses.<br> <br>
|
||||
|
||||
<i>This app is a fork of the original \"DiasporaNativeWebApp\"
|
||||
from \"martinchodev\". The splashscreen images can be found on flickr:
|
||||
<i>The splashscreen images can be found on flickr:
|
||||
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
|
||||
They were published by \"Lydia\" and are licensed under cc by-nc-sa.</i></string>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue