Skip to content

Commit dfec474

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #239 from nextcloud/participate
Motivate more users
2 parents 0bec9c3 + 07f5d95 commit dfec474

File tree

14 files changed

+335
-11
lines changed

14 files changed

+335
-11
lines changed

‎AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
</intent-filter>
7474
</activity>
7575
<activity android:name=".ui.activity.ManageAccountsActivity" />
76+
<activity android:name=".ui.activity.ParticipateActivity" />
7677
<activity android:name=".ui.activity.UploadFilesActivity" />
7778
<activity android:name=".ui.activity.ReceiveExternalFilesActivity"
7879
android:taskAffinity=""

‎res/drawable-hdpi/ic_participate.png

754 Bytes
Loading

‎res/drawable-mdpi/ic_participate.png

535 Bytes
Loading

‎res/drawable-xhdpi/ic_participate.png

910 Bytes
Loading

‎res/drawable-xxhdpi/ic_participate.png

1.31 KB
Loading

‎res/drawable-xxxhdpi/fdroid.png

14.8 KB
Loading

‎res/drawable-xxxhdpi/ic_participate.png

1.76 KB
Loading

‎res/drawable-xxxhdpi/playstore.png

13.6 KB
Loading

‎res/layout/participate_layout.xml

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Nextcloud Android client application
4+
5+
Copyright (C) 2016 Tobias Kaminsky
6+
Copyright (C) 2016 Nextcloud.
7+
8+
This program is free software; you can redistribute it and/or
9+
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
10+
License as published by the Free Software Foundation; either
11+
version 3 of the License, or any later version.
12+
13+
This program is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
GNU AFFERO GENERAL PUBLIC LICENSE for more details.
17+
18+
You should have received a copy of the GNU Affero General Public
19+
License along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
-->
21+
<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
22+
xmlns:android="http://schemas.android.com/apk/res/android"
23+
android:layout_width="match_parent"
24+
android:layout_height="match_parent"
25+
android:clickable="true"
26+
android:fitsSystemWindows="true">
27+
28+
<!-- The main content view -->
29+
<LinearLayout
30+
android:layout_width="match_parent"
31+
android:layout_height="match_parent"
32+
android:orientation="vertical">
33+
34+
<include
35+
layout="@layout/toolbar_standard"/>
36+
37+
<ScrollView
38+
android:id="@+id/scrollView"
39+
android:layout_width="fill_parent"
40+
android:layout_height="wrap_content">
41+
42+
<LinearLayout
43+
android:layout_width="match_parent"
44+
android:layout_height="wrap_content"
45+
android:orientation="vertical"
46+
android:padding="@dimen/standard_padding">
47+
48+
<TextView
49+
android:id="@+id/participate_headline"
50+
android:layout_width="fill_parent"
51+
android:layout_height="wrap_content"
52+
android:text="@string/participate_testing_headline"
53+
android:textAppearance="?android:attr/textAppearanceLarge"/>
54+
55+
<TextView
56+
android:id="@+id/participate_testing_bug_text"
57+
android:layout_width="fill_parent"
58+
android:layout_height="wrap_content"
59+
android:paddingBottom="@dimen/standard_half_padding"
60+
android:text="@string/participate_testing_bug_text"
61+
android:textAppearance="?android:attr/textAppearanceMedium"/>
62+
63+
<android.support.v7.widget.AppCompatButton
64+
android:layout_width="wrap_content"
65+
android:layout_height="wrap_content"
66+
android:onClick="onReportIssueClick"
67+
android:text="@string/participate_testing_report_text"
68+
android:theme="@style/Button.Primary"/>
69+
70+
<TextView
71+
android:id="@+id/participate_text"
72+
android:layout_width="fill_parent"
73+
android:layout_height="wrap_content"
74+
android:paddingBottom="@dimen/standard_half_padding"
75+
android:paddingTop="@dimen/standard_half_padding"
76+
android:text="@string/participate_testing_version_text"
77+
android:textAppearance="?android:attr/textAppearanceMedium"/>
78+
79+
<TextView
80+
android:id="@+id/participate_release_candidate_headline"
81+
android:layout_width="fill_parent"
82+
android:layout_height="wrap_content"
83+
android:text="@string/participate_release_candidate_headline"
84+
android:textAppearance="?android:attr/textAppearanceLarge"/>
85+
86+
<TextView
87+
android:id="@+id/participate_release_candidate_text"
88+
android:layout_width="fill_parent"
89+
android:layout_height="wrap_content"
90+
android:text="@string/participate_release_candidate_text"
91+
android:textAppearance="?android:attr/textAppearanceMedium"/>
92+
93+
<LinearLayout
94+
android:layout_width="match_parent"
95+
android:layout_height="wrap_content">
96+
97+
<ImageButton
98+
android:id="@+id/participate_release_candidate_playstore"
99+
android:layout_width="wrap_content"
100+
android:layout_height="wrap_content"
101+
android:background="@color/white"
102+
android:onClick="onGetRCPlayStoreClick"
103+
android:padding="0dp"
104+
android:src="@drawable/playstore"/>
105+
106+
<ImageButton
107+
android:id="@+id/participate_release_candidate_fdroid"
108+
android:layout_width="wrap_content"
109+
android:layout_height="wrap_content"
110+
android:background="@color/white"
111+
android:onClick="onGetRCFDroidClick"
112+
android:padding="0dp"
113+
android:src="@drawable/fdroid"/>
114+
115+
</LinearLayout>
116+
117+
<TextView
118+
android:id="@+id/participate_beta_headline"
119+
android:layout_width="fill_parent"
120+
android:layout_height="wrap_content"
121+
android:text="@string/participate_beta_headline"
122+
android:textAppearance="?android:attr/textAppearanceLarge"/>
123+
124+
<TextView
125+
android:id="@+id/participate_beta_text"
126+
android:layout_width="fill_parent"
127+
android:layout_height="wrap_content"
128+
android:text="@string/participate_beta_text"
129+
android:textAppearance="?android:attr/textAppearanceMedium"/>
130+
131+
<ImageButton
132+
android:id="@+id/participate_beta_fdroid"
133+
android:layout_width="wrap_content"
134+
android:layout_height="wrap_content"
135+
android:background="@color/white"
136+
android:onClick="onGetBetaFDroidClick"
137+
android:padding="0dp"
138+
android:src="@drawable/fdroid"/>
139+
140+
<TextView
141+
android:id="@+id/participate_contribute_headline"
142+
android:layout_width="wrap_content"
143+
android:layout_height="wrap_content"
144+
android:text="@string/participate_contribute_headline"
145+
android:textAppearance="?android:attr/textAppearanceLarge"/>
146+
147+
<TextView
148+
android:id="@+id/participate_contribute_text"
149+
android:layout_width="wrap_content"
150+
android:layout_height="wrap_content"
151+
android:text="@string/participate_contribute_text"
152+
android:paddingLeft="@dimen/standard_half_padding"
153+
android:textAppearance="?android:attr/textAppearanceMedium"/>
154+
</LinearLayout>
155+
</ScrollView>
156+
157+
</LinearLayout>
158+
159+
<include
160+
layout="@layout/drawer"
161+
android:layout_width="240dp"
162+
android:layout_height="match_parent"
163+
android:layout_gravity="start"/>
164+
165+
</android.support.v4.widget.DrawerLayout>

‎res/menu/drawer_menu.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,17 @@
6060
<!--
6161
all items in this group MUST have orderInCategory="3" set
6262
-->
63-
<group>
63+
<group android:id="@+id/drawer_menu_bottom" android:checkableBehavior="single">
6464
<item
6565
android:orderInCategory="3"
6666
android:id="@+id/nav_settings"
6767
android:icon="@drawable/ic_settings"
6868
android:title="@string/actionbar_settings"/>
69+
<item
70+
android:orderInCategory="3"
71+
android:id="@+id/nav_participate"
72+
android:icon="@drawable/ic_participate"
73+
android:title="@string/drawer_participate"/>
6974
</group>
7075

7176
<!--

0 commit comments

Comments
 (0)