MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 10:35:50 +01:00
Code Releases Wiki Activity

Improve padding. Use better (i) icon. Add 'unlisted contributors'.

Browse Source
This commit is contained in:
vanous 2020-07-12 10:38:56 +02:00
parent c1a8fb502c
commit 2496b40a88
6 changed files with 116 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AboutActivity.java
View File

@ -19,16 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
import android.os.Bundle; import android.os.Bundle;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.TextView; import android.widget.TextView;
import androidx.appcompat.widget.SearchView;
import androidx.core.app.NavUtils;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -45,11 +37,11 @@ public class AboutActivity extends AbstractGBActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about); setContentView(R.layout.activity_about);
TextView link1 = (TextView) findViewById(R.id.about4); TextView link1 = (TextView) findViewById(R.id.links1);
link1.setMovementMethod(LinkMovementMethod.getInstance()); link1.setMovementMethod(LinkMovementMethod.getInstance());
TextView link2 = (TextView) findViewById(R.id.about5); TextView link2 = (TextView) findViewById(R.id.links2);
link2.setMovementMethod(LinkMovementMethod.getInstance()); link2.setMovementMethod(LinkMovementMethod.getInstance());
TextView link3 = (TextView) findViewById(R.id.about6); TextView link3 = (TextView) findViewById(R.id.links3);
link3.setMovementMethod(LinkMovementMethod.getInstance()); link3.setMovementMethod(LinkMovementMethod.getInstance());
} }

9
app/src/main/res/drawable/ic_info_black.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"
android:fillColor="#000000"/>
</vector>

78
app/src/main/res/layout/activity_about.xml
View File

@ -1,8 +1,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout 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: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:paddingLeft="@dimen/activity_horizontal_margin" android:background="@drawable/gadgetbridge_img"
android:paddingLeft="@dimen/about_margin"
tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AboutActivity"> tools:context="nodomain.freeyourgadget.gadgetbridge.activities.AboutActivity">
<ScrollView <ScrollView
@ -15,80 +17,132 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/about1" android:id="@+id/about_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Gadgetbridge" android:text="Gadgetbridge"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/accent" /> android:textColor="@color/accent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="@dimen/about_margin">
<TextView <TextView
android:id="@+id/about2" android:id="@+id/about_desc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_description" /> android:text="@string/about_description" />
</LinearLayout>
<TextView <TextView
android:id="@+id/about3" android:id="@+id/links_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Links" android:text="Links"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/accent" /> android:textColor="@color/accent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="@dimen/about_margin">
<TextView <TextView
android:id="@+id/about4" android:id="@+id/links1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/homepage_url" /> android:text="@string/homepage_url" />
<TextView <TextView
android:id="@+id/about5" android:id="@+id/links2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/codeberg_url" /> android:text="@string/codeberg_url" />
<TextView <TextView
android:id="@+id/about6" android:id="@+id/links3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/fdroid_url" /> android:text="@string/fdroid_url" />
</LinearLayout>
<TextView <TextView
android:id="@+id/about7" android:id="@+id/contrib_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_contributors" android:text="@string/about_contributors"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@color/accent" /> android:textColor="@color/accent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="@dimen/about_margin">
<TextView <TextView
android:id="@+id/about8" android:id="@+id/contrib_core_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_core_team_title" android:text="@string/about_core_team_title"
android:textColor="@color/accent" /> android:textColor="@color/accent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="@dimen/about_margin">
<TextView <TextView
android:id="@+id/about9" android:id="@+id/contrib_core_members"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_core_team_members" /> android:text="@string/about_core_team_members" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="@dimen/about_margin">
<TextView <TextView
android:id="@+id/about10" android:id="@+id/contrib_add_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_additional_device_support" android:text="@string/about_additional_device_support"
android:textColor="@color/accent" /> android:textColor="@color/accent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="@dimen/about_margin">
<TextView <TextView
android:id="@+id/about11" android:id="@+id/contrib_add_members"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_additional_contributors" /> android:text="@string/about_additional_contributors" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/contrib_add_title2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/about_additional_contributions"
android:textColor="@color/accent" />
</LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>
</RelativeLayout> </RelativeLayout>

4
app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml
View File

@ -38,8 +38,8 @@
android:icon="@drawable/ic_history_black" /> android:icon="@drawable/ic_history_black" />
<item <item
android:id="@+id/about" android:id="@+id/about"
android:title="@string/about_title" android:icon="@drawable/ic_info_black"
android:icon="@drawable/gadgetbridge_img" /> android:title="@string/about_title" />
</group> </group>
</menu> </menu>

1
app/src/main/res/values/dimens.xml
View File

@ -7,6 +7,7 @@
Refer to App Widget Documentation for margin information Refer to App Widget Documentation for margin information
http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
--> -->
<dimen name="about_margin">4dp</dimen>
<dimen name="widget_margin">8dp</dimen> <dimen name="widget_margin">8dp</dimen>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="nav_header_vertical_spacing">16dp</dimen> <dimen name="nav_header_vertical_spacing">16dp</dimen>

1
app/src/main/res/values/strings.xml
View File

@ -877,6 +877,7 @@
<string name="about_core_team_members" translatable="false">Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti</string> <string name="about_core_team_members" translatable="false">Andreas Shimokawa\nCarsten Pfeiffer\nDaniele Gobbetti</string>
<string name="about_additional_device_support">Additional device support</string> <string name="about_additional_device_support">Additional device support</string>
<string name="about_additional_contributors" translatable="false">João Paulo Barraca (HPlus)\nVitaly Svyastyn (NO.1 F1)\nSami Alaoui (Teclast H30)\n“ladbsoft” (XWatch)\nSebastian Kranz (ZeTime)\nVadim Kaushan (ID115)\n“maxirnilian” (Lenovo Watch 9)\n“ksiwczynski”, “mkusnierz”, “mamutcho” (Lenovo Watch X Plus)\nAndreas Böhler (Casio GB-6900B)\nJean-François Greffier (Mi Scale 2)\nJohannes Schmitt (BFH-16)\nLukas Schwichtenberg (Makibes HR3)\nDaniel Dakhno (Fossil Q Hybrid, Fossil Hybrid HR)\nGordon Williams (Bangle.js)\nPavel Elagin (JYou Y5)\nTaavi Eomäe (iTag)</string> <string name="about_additional_contributors" translatable="false">João Paulo Barraca (HPlus)\nVitaly Svyastyn (NO.1 F1)\nSami Alaoui (Teclast H30)\n“ladbsoft” (XWatch)\nSebastian Kranz (ZeTime)\nVadim Kaushan (ID115)\n“maxirnilian” (Lenovo Watch 9)\n“ksiwczynski”, “mkusnierz”, “mamutcho” (Lenovo Watch X Plus)\nAndreas Böhler (Casio GB-6900B)\nJean-François Greffier (Mi Scale 2)\nJohannes Schmitt (BFH-16)\nLukas Schwichtenberg (Makibes HR3)\nDaniel Dakhno (Fossil Q Hybrid, Fossil Hybrid HR)\nGordon Williams (Bangle.js)\nPavel Elagin (JYou Y5)\nTaavi Eomäe (iTag)</string>
<string name="about_additional_contributions">Many thanks to all unlisted contributors for contributing code, support, ideas, motivation, bug reports, money... ✊</string>
<plurals name="widget_alarm_target_hours"> <plurals name="widget_alarm_target_hours">
<item quantity="one">%d hour</item> <item quantity="one">%d hour</item>