vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-08 21:31:10 +01:00
Code Issues Releases Wiki Activity

Refactoring; package movement;changed package name due to organisation name

Browse source
This commit is contained in:
Gregor Santner 2016-03-26 01:14:17 +01:00
parent 30734f8f2a
commit 4482f09430
30 changed files with 205 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/activity_main.xml
View file

@ -20,6 +20,6 @@
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer" />
app:menu="@menu/navdrawer_main" />
</android.support.v4.widget.DrawerLayout>

42
app/src/main/res/layout/activity_pods.xml
View file

@ -1,52 +1,54 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/podsLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:id="@+id/podsLayout"
tools:context="ar.com.tristeslostrestigres.diasporanativewebapp.PodsActivity">
tools:context=".activity.PodsActivity">
<ListView
android:id="@+id/lstPods"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/lstPods"
android:choiceMode="singleChoice"
android:layout_above="@+id/navheader_description"
android:layout_below="@+id/edtFilter"
android:layout_above="@+id/navheader_description" />
android:choiceMode="singleChoice" />
<EditText
android:id="@+id/edtFilter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/edtFilter"
android:layout_alignParentTop="true"
android:hint="@string/filter_hint"
android:layout_toLeftOf="@+id/imgSelectPod"
android:layout_toStartOf="@+id/imgSelectPod"
android:hint="@string/filter_hint"
android:inputType="textUri|textWebEditText" />
<ImageView
android:id="@+id/imgSelectPod"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:paddingLeft="5dp"
android:id="@+id/imgSelectPod"
android:src="@mipmap/ic_arrow_right_grey600_24dp"
android:layout_above="@+id/lstPods"
android:layout_alignRight="@+id/lstPods"
android:layout_alignEnd="@+id/lstPods"
android:layout_alignRight="@+id/lstPods"
android:layout_alignTop="@+id/edtFilter"
android:contentDescription="@string/confirm_url" />
android:contentDescription="@string/confirm_url"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:src="@mipmap/ic_arrow_right_grey600_24dp" />
<TextView
android:id="@+id/navheader_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/podlist_source_note"
android:id="@+id/navheader_description"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
android:layout_alignParentStart="true"
android:text="@string/podlist_source_note"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>

10
app/src/main/res/layout/activity_splash.xml
View file

@ -2,15 +2,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ar.com.tristeslostrestigres.diasporanativewebapp.SplashActivity">
tools:context=".activity.SplashActivity">
<ImageView
android:id="@+id/imgSplash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imgSplash"
android:src="@drawable/splashscreen1"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:contentDescription="@string/splash_screen_description"
android:scaleType="centerCrop"
android:contentDescription="@string/splash_screen_description" />
android:src="@drawable/splashscreen1" />
</RelativeLayout>

38
app/src/main/res/layout/app_bar_main.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout 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"
xmlns:fab="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
@ -26,18 +26,18 @@
<com.getbase.floatingactionbutton.FloatingActionsMenu
android:id="@+id/fab_menubutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginBottom="4dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:visibility="gone"
app:layout_behavior="de.dfa.diaspora_android.ui.FloatingActionsMenuBehavior"
fab:fab_addButtonColorNormal="@color/fab_big"
fab:fab_addButtonColorPressed="@color/fab_big_pressed"
fab:fab_addButtonPlusIconColor="@color/white"
fab:fab_labelStyle="@style/menu_labels_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="bottom|end"
android:layout_marginRight="8dp"
android:layout_marginBottom="4dp"
android:layout_marginEnd="8dp"
app:layout_behavior="de.dfa.diaspora.FloatingActionsMenuBehavior">
fab:fab_labelStyle="@style/menu_labels_style">
<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_top"
@ -45,11 +45,11 @@
android:layout_height="wrap_content"
android:onClick="fab3_click"
fab:fab_colorNormal="@color/fab_small"
fab:fab_icon="@drawable/fab_top"
fab:fab_title="@string/fab3_title"
fab:fab_colorPressed="@color/fab_small_pressed"
fab:fab_icon="@drawable/fab_top"
fab:fab_labelStyle="@style/menu_labels_style"
fab:fab_size="mini" />
fab:fab_size="mini"
fab:fab_title="@string/fab3_title" />
<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_search"
@ -57,11 +57,11 @@
android:layout_height="wrap_content"
android:onClick="fab2_click"
fab:fab_colorNormal="@color/fab_small"
fab:fab_icon="@drawable/fab_search"
fab:fab_title="@string/fab2_title"
fab:fab_colorPressed="@color/fab_small_pressed"
fab:fab_icon="@drawable/fab_search"
fab:fab_labelStyle="@style/menu_labels_style"
fab:fab_size="mini" />
fab:fab_size="mini"
fab:fab_title="@string/fab2_title" />
<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_compose"
@ -69,10 +69,10 @@
android:layout_height="wrap_content"
android:onClick="fab1_click"
fab:fab_colorNormal="@color/fab_small"
fab:fab_icon="@drawable/fab_compose"
fab:fab_title="@string/fab1_title"
fab:fab_colorPressed="@color/fab_small_pressed"
fab:fab_size="mini" />
fab:fab_icon="@drawable/fab_compose"
fab:fab_size="mini"
fab:fab_title="@string/fab1_title" />
</com.getbase.floatingactionbutton.FloatingActionsMenu>

18
app/src/main/res/layout/content_main.xml
View file

@ -11,26 +11,26 @@
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<WebView
android:id="@+id/webView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/webView"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true" />
</android.support.v4.widget.SwipeRefreshLayout>
<ProgressBar
android:minHeight="4dip"
android:maxHeight="4dip"
android:id="@+id/progressBar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="@android:style/Widget.ProgressBar.Horizontal"
android:id="@+id/progressBar" />
android:maxHeight="4dip"
android:minHeight="4dip" />
</RelativeLayout>

11
app/src/main/res/layout/font_size_chooser.xml
View file

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:gravity="center_horizontal"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<RadioGroup
android:id="@+id/genderRadioGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<RadioButton

13
app/src/main/res/menu/menu_compose.xml
View file

@ -1,6 +1,7 @@
<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=".MainActivity">
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.MainActivity">
<item
android:id="@+id/action_exit"
@ -9,11 +10,11 @@
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" />-->
<!--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>

3
app/src/main/res/menu/menu_main.xml
View file

@ -1,6 +1,7 @@
<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=".MainActivity">
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.MainActivity">
<item
android:id="@+id/action_notifications"

4
app/src/main/res/menu/menu_pods.xml
View file

@ -1,12 +1,12 @@
<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="ar.com.tristeslostrestigres.diasporanativewebapp.PodsActivity">
tools:context=".activity.PodsActivity">
<item
android:id="@+id/action_reload"
android:title="@string/reload"
android:icon="@drawable/ic_sync_white_24dp"
android:orderInCategory="100"
android:title="@string/reload"
app:showAsAction="ifRoom" />
</menu>

4
app/src/main/res/menu/activity_main_drawer.xml → app/src/main/res/menu/navdrawer_main.xml
View file

@ -15,10 +15,10 @@
<!-- TODO followed_tags currently not implemented as single viewable page
(0.5.7.1-paf04894e, 2016 March 20) -->
<item
android:visible="false"
android:id="@+id/nav_followed_tags"
android:icon="@drawable/jb_tag2"
android:title="@string/jb_followed_tags" />
android:title="@string/jb_followed_tags"
android:visible="false" />
<item
android:id="@+id/nav_aspects"
android:icon="@drawable/jb_aspects"

2
app/src/main/res/values-de/strings.xml
View file

@ -152,6 +152,6 @@ along with this program. If not, see http://www.gnu.org/licenses.&lt;br> &lt;br
<string name="new_post2">D* Titel und Text</string>
<string name="jb_profile">Profil</string>
<string name="new_post1">D* nur Text</string>
<string name="shared_by_diaspora_android">*[geteilt durch #DiasporaAndroid]*</string>
<string name="shared_by_diaspora_android">*[geteilt durch #diaspora-android]*</string>
</resources>

2
app/src/main/res/values/strings.xml
View file

@ -205,5 +205,5 @@
<string name="exit_app">Exit app</string>
<string name="diaspora" translatable="false">Diaspora</string>
<string name="shared_by_diaspora_android">*[shared by #DiasporaAndroid]*</string>
<string name="shared_by_diaspora_android">*[shared by #diaspora-android]*</string>
</resources>