Some improvements
This commit is contained in:
parent
dc99f1a1b9
commit
eee60f107a
|
@ -2098,6 +2098,10 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
|
Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
return false;
|
return false;
|
||||||
|
}else if (id == R.id.nav_opencollective) {
|
||||||
|
Intent intent = new Intent(getApplicationContext(), OpencollectiveActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
return false;
|
||||||
} else if( id == R.id.nav_upload) {
|
} else if( id == R.id.nav_upload) {
|
||||||
Intent intent = new Intent(getApplicationContext(), PeertubeUploadActivity.class);
|
Intent intent = new Intent(getApplicationContext(), PeertubeUploadActivity.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
|
@ -2217,10 +2221,6 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
fragmentTag = "HOW_TO_VIDEOS";
|
fragmentTag = "HOW_TO_VIDEOS";
|
||||||
fragmentManager.beginTransaction()
|
fragmentManager.beginTransaction()
|
||||||
.replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit();
|
.replace(R.id.main_app_container, displayHowToFragment, fragmentTag).commit();
|
||||||
}else if (id == R.id.nav_opencollective) {
|
|
||||||
Intent intent = new Intent(getApplicationContext(), OpencollectiveActivity.class);
|
|
||||||
startActivity(intent);
|
|
||||||
return false;
|
|
||||||
}else if (id == R.id.nav_muted || id == R.id.nav_pixelfed_muted) {
|
}else if (id == R.id.nav_muted || id == R.id.nav_pixelfed_muted) {
|
||||||
toot.hide();
|
toot.hide();
|
||||||
accountsFragment = new DisplayAccountsFragment();
|
accountsFragment = new DisplayAccountsFragment();
|
||||||
|
|
|
@ -98,7 +98,7 @@ public class OpencollectiveActivity extends BaseActivity implements OnRetrieveRe
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
toolbar_title.setText(R.string.action_about);
|
toolbar_title.setText("Open Collective");
|
||||||
if (theme == THEME_LIGHT){
|
if (theme == THEME_LIGHT){
|
||||||
Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
|
Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
|
||||||
Helper.colorizeToolbar(toolbar, R.color.black, OpencollectiveActivity.this);
|
Helper.colorizeToolbar(toolbar, R.color.black, OpencollectiveActivity.this);
|
||||||
|
|
|
@ -24,9 +24,11 @@
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="@dimen/fab_margin"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
<!-- About OpenCollective -->
|
<!-- About OpenCollective -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -35,6 +37,9 @@
|
||||||
android:padding="5dp">
|
android:padding="5dp">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:drawableStart="@drawable/ic_opencollective"
|
||||||
|
android:drawableLeft="@drawable/ic_opencollective"
|
||||||
|
android:drawablePadding="5dp"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
|
@ -52,7 +57,12 @@
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:text="@string/more_about_opencollective"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
<!-- About developer -->
|
<!-- About developer -->
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -870,6 +870,7 @@
|
||||||
<string name="set_optimize_loading">Optimize loading time</string>
|
<string name="set_optimize_loading">Optimize loading time</string>
|
||||||
<string name="all">All</string>
|
<string name="all">All</string>
|
||||||
<string name="about_opencollective">Support the app</string>
|
<string name="about_opencollective">Support the app</string>
|
||||||
|
<string name="more_about_opencollective">Open Collective enables groups to quickly set up a collective, raise funds and manage them transparently.</string>
|
||||||
<!-- end languages -->
|
<!-- end languages -->
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue