Skip to content

Commit a31a530

Browse files
authored
Release v0.2.2
* Move toggle mobile/desktop to navslider (opt-in) * Update TR
1 parent 05e6e4d commit a31a530

33 files changed

Lines changed: 291 additions & 59 deletions

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
# v0.2.2
2+
- Move "toggle mobile/deskop" to nav-slider
3+
- Reduce messages sent via broadcast
4+
- Allow to jump to last visited page on stream
5+
- New language: Hungarian
6+
- FIX NullPtr in shared text methods
7+
- FIX #117 - Reset NavHeader on change account, reset web profile
8+
- FIX #92 Roation settings
9+
- FIX #111 Remove legacy code
10+
111
# v0.2.1
2-
- App name changed to **dandelion\***
12+
- App name changed to **dandelion***
313
- Rotation options
414
- Top toolbar loads screen again (toggleable in settings)
515
- Fixed overlapping fragments

CONTRIBUTORS.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ Airon90 (https://diasp.eu/u/airon90): Italian translation
1313
Gaukler Faun (https://github.com/scoute-dich): Diaspora Native WebApp additions
1414
Martín Vukovic (martinvukovic AT protonmail DOT com): Diaspora Native WebApp
1515
Nacho Fernández (nacho_f AT joindiaspora DOT com): Spanish translation
16+
Naofumi Fukue (https://github.com/naofum): Japanese translation
1617
pskosinski (email AT pskosinski DOT pl): Polish translation
1718
SansPseudoFix (https://github.com/SansPseudoFix): French translation
19+
Zsolt Szakács (maxigaz AT diaspora DOT zone): Hungarian translation

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# dandelion\*
1010
FORMERLY KNOWN AS DIASPORA-FOR-ANDROID
1111

12-
This is an unofficial webview based client for the community-run, distributed social network **[Diaspora*](https://diasporafoundation.org/)**. It's currently under development and should be used with that in mind. Please submit any bugs you might find.
12+
This is an unofficial webview based client for the community-run, distributed social network **[diaspora*](https://diasporafoundation.org/)**. It's currently under development and should be used with that in mind. Please submit any bugs you might find.
1313

1414
- Download ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android), [Release Archive](https://github.com/Diaspora-for-Android/dandelion/releases))
1515
- Watch [Changelog](https://github.com/Diaspora-for-Android/dandelion/blob/master/CHANGELOG.md)
@@ -41,4 +41,4 @@ dandelion\* requires access to the Internet and to external storage to be able t
4141

4242
## Maintainers
4343
- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))
44-
- vanitasvitae ([GitHub](https://github.com/vanitasvitae), [Diaspora](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))
44+
- vanitasvitae ([GitHub](https://github.com/vanitasvitae), [diaspora*](https://pod.geraspora.de/people/bbd7af90fbec013213e34860008dbc6c))

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
minSdkVersion 17
1111
targetSdkVersion 24
1212
versionCode 12
13-
versionName "0.2.1-next"
13+
versionName "0.2.2"
1414
setProperty("archivesBaseName", "dandelion__${versionName}__")
1515

1616
vectorDrawables.useSupportLibrary = true

app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
127127
}
128128
}
129129

130-
case R.id.action_toggle_desktop_page: {
131-
loadUrl(urls.getToggleMobileUrl());
132-
return true;
133-
}
134-
135130
case R.id.action_go_to_top: {
136131
ObjectAnimator anim = ObjectAnimator.ofInt(webView, "scrollY", webView.getScrollY(), 0);
137132
anim.setDuration(400);

app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ protected void updateNavigationViewEntryVisibilities() {
413413
navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities());
414414
navMenu.findItem(R.id.nav_stream).setVisible(true);
415415
navMenu.findItem(R.id.nav_reports).setVisible(appSettings.isVisibleInNavReports());
416+
navMenu.findItem(R.id.nav_toggle_desktop_page).setVisible(appSettings.isVisibleToggleMobileDesktop());
416417

417418

418419
// Hide whole group (for logged in use) if no pod was selected
@@ -769,12 +770,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
769770
}
770771
}
771772

772-
case R.id.action_exit: {
773-
moveTaskToBack(true);
774-
finish();
775-
return true;
776-
}
777-
778773
case R.id.action_compose: {
779774
if (WebHelper.isOnline(MainActivity.this)) {
780775
openDiasporaUrl(urls.getNewPostUrl());
@@ -1076,6 +1071,11 @@ public boolean onNavigationItemSelected(MenuItem item) {
10761071
}
10771072
break;
10781073

1074+
case R.id.nav_toggle_desktop_page: {
1075+
openDiasporaUrl(urls.getToggleMobileUrl());
1076+
}
1077+
break;
1078+
10791079
case R.id.nav_exit: {
10801080
moveTaskToBack(true);
10811081
finish();

app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@ public boolean isVisibleInNavReports() {
404404
return getBoolean(prefApp, R.string.pref_key__visibility_nav__reports, false);
405405
}
406406

407+
public boolean isVisibleToggleMobileDesktop() {
408+
return getBoolean(prefApp, R.string.pref_key__visibility_nav__toggle_mobile_desktop, false);
409+
}
410+
407411
public boolean isTopbarStreamShortcutEnabled() {
408412
return getBoolean(prefApp, R.string.pref_key__topbar_stream_shortcut, false);
409413
}

app/src/main/res/menu/main__menu_bottom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,4 @@
1919
android:title="@string/action_compose_new_post"
2020
app:showAsAction="always" />
2121

22-
<!-- overflow menu -->
23-
<item
24-
android:id="@+id/action_exit"
25-
android:orderInCategory="600"
26-
android:title="@string/action_exit_app"
27-
app:showAsAction="never" />
28-
2922
</menu>

app/src/main/res/menu/main__navdrawer.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767

6868
<item android:title="@string/nav_menu_more">
6969
<menu>
70+
<item
71+
android:id="@+id/nav_toggle_desktop_page"
72+
android:icon="@drawable/ic_sync_white_48px"
73+
android:title="@string/action_toggle_desktop_page" />
74+
7075
<item
7176
android:id="@+id/nav_settings"
7277
android:icon="@drawable/ic_settings_black_48px"

app/src/main/res/menu/stream__menu_bottom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,4 @@
2929
android:title="@string/action_go_to_top"
3030
app:showAsAction="always" />
3131

32-
33-
<!-- overflow menu -->
34-
<item
35-
android:id="@+id/action_toggle_desktop_page"
36-
android:icon="@drawable/ic_sync_white_48px"
37-
android:orderInCategory="700"
38-
android:title="@string/action_toggle_desktop_page"
39-
app:showAsAction="never" />
40-
4132
</menu>

0 commit comments

Comments
 (0)