Some changes
This commit is contained in:
parent
3d9356bdfa
commit
504107ca36
|
@ -94,9 +94,6 @@ public class PartnerShipActivity extends BaseActivity implements OnRetrieveRemot
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
TextView about_mastohost = findViewById(R.id.about_mastohost);
|
|
||||||
about_mastohost.setMovementMethod(LinkMovementMethod.getInstance());
|
|
||||||
|
|
||||||
setTitle(R.string.action_partnership);
|
setTitle(R.string.action_partnership);
|
||||||
lv_mastohost.setExpanded(true);
|
lv_mastohost.setExpanded(true);
|
||||||
|
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 9.8 KiB |
|
@ -16,10 +16,8 @@
|
||||||
see <http://www.gnu.org/licenses>.
|
see <http://www.gnu.org/licenses>.
|
||||||
-->
|
-->
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:layout_marginRight="@dimen/fab_margin"
|
android:layout_marginRight="@dimen/fab_margin"
|
||||||
android:layout_marginEnd="@dimen/fab_margin"
|
android:layout_marginEnd="@dimen/fab_margin"
|
||||||
android:layout_marginLeft="@dimen/fab_margin"
|
android:layout_marginLeft="@dimen/fab_margin"
|
||||||
|
@ -33,41 +31,35 @@
|
||||||
>
|
>
|
||||||
<!-- About masto.host -->
|
<!-- About masto.host -->
|
||||||
<ImageView
|
<ImageView
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
android:id="@+id/mastohost_logo"
|
android:id="@+id/mastohost_logo"
|
||||||
android:layout_marginBottom="20dp"
|
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_width="200dp"
|
android:layout_width="200dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="110dp"
|
||||||
android:src="@drawable/mastohost"
|
android:src="@drawable/mastohost"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
<!-- About partnership -->
|
<!-- About partnership -->
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="30dp"
|
||||||
android:textSize="14sp"
|
android:textSize="16sp"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:paddingRight="20dp"
|
||||||
android:id="@+id/about_partnership"
|
android:id="@+id/about_partnership"
|
||||||
android:text="@string/about_partnership"
|
android:text="@string/about_partnership"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
|
||||||
<fr.gouv.etalab.mastodon.helper.ExpandableHeightListView
|
<fr.gouv.etalab.mastodon.helper.ExpandableHeightListView
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
|
android:paddingLeft="20dp"
|
||||||
|
android:paddingRight="20dp"
|
||||||
android:id="@+id/lv_mastohost"
|
android:id="@+id/lv_mastohost"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scrollbars="none"
|
android:scrollbars="none"
|
||||||
android:divider="@null"/>
|
android:divider="@null"/>
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/about_mastohost"
|
|
||||||
android:padding="5dp"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/about_mastohost"
|
|
||||||
android:textSize="16sp"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
|
@ -552,11 +552,7 @@
|
||||||
<string name="crash_message">You can send me by email the crash report. It will help to fix it :)\n\nYou can add additional content. Thank you!</string>
|
<string name="crash_message">You can send me by email the crash report. It will help to fix it :)\n\nYou can add additional content. Thank you!</string>
|
||||||
<string name="send_crash_report">Ask for sending crash reports by email?</string>
|
<string name="send_crash_report">Ask for sending crash reports by email?</string>
|
||||||
<string name="mastohost_name" translatable="false">masto.host</string>
|
<string name="mastohost_name" translatable="false">masto.host</string>
|
||||||
<string name="about_partnership" translatable="false">
|
<string name="about_partnership" translatable="false"><b>Masto.host</b> is our Mastodon hosting partner.\nWith this partnership they provide me free hosting for <a href="https://ins.mastalab.app">Mastalab\'s instance</a> and in exchange I promote them in here.\nTo be clear, there is no money involved or tracking of users sent. I needed an instance for testing, we talked and agreed on this.\n\n<a href="https://masto.host">Go check them</a> out if you want to run your own Mastodon instance.</string>
|
||||||
Mastalab has a partnership with Masto.host\nMasto.host offers hosting for <a href="https://ins.mastalab.app">Mastalab\'s instance</a> for free.\nThis helps me to better understand how to manage an instance. If one day the API is open to moderators,
|
|
||||||
I would be glad to be able to test new features.
|
|
||||||
</string>
|
|
||||||
<string name="about_mastohost" translatable="false"><a href="https://masto.host">Masto.host</a> is a fully managed Mastodon hosting service, meaning that you can create your own instance without having to touch a single line of code or maintain your own server.</string>
|
|
||||||
<string name="action_partnership" >Partnerships</string>
|
<string name="action_partnership" >Partnerships</string>
|
||||||
<string name="neutral_menu_information">Information</string>
|
<string name="neutral_menu_information">Information</string>
|
||||||
<string-array translatable="false" name="proxy_type_choice">
|
<string-array translatable="false" name="proxy_type_choice">
|
||||||
|
|
Loading…
Reference in New Issue