Add button to info screen ・ 6c2415f ・ Gitprep

- Add button to info screen;
- Browse files
- Miles McCain commited on 2017-07-31
- 1 parent 3ba5395
  
  commit 6c2415fe3d1c628d9e72d7ac29e6c4e98393f287

Showing 5 changed files with 34 additions and 12 deletions

LibreNews-App/src/main/java/app/librenews/io/librenews/views/MainFlashActivity.java

@@ -67,6 +67,13 @@ public class MainFlashActivity extends AppCompatActivity {
                 manager.refresh();
             }
         });
+        findViewById(R.id.app_info).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getApplicationContext(), WelcomeActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 
     @Override

+20 -6

LibreNews-App/src/main/res/layout/activity_flash_view.xml

View

@@ -35,6 +35,21 @@
             app:layout_constraintRight_toRightOf="@+id/toolbar"
             app:layout_constraintTop_toTopOf="@+id/toolbar" />
 
+        <Button
+            android:id="@+id/app_info"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="56dp"
+            android:layout_height="48dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:text="@string/app_info_label"
+            android:textColor="@android:color/background_light"
+            app:layout_constraintBottom_toBottomOf="@+id/refresh_button"
+            app:layout_constraintRight_toLeftOf="@+id/refresh_button"
+            app:layout_constraintTop_toTopOf="@+id/refresh_button"
+            tools:layout_editor_absoluteX="224dp"
+            app:layout_constraintVertical_bias="0.0" />
+
         <TextView
             android:id="@+id/server_status"
             android:layout_width="0dp"
@@ -65,21 +80,20 @@
             app:layout_constraintBottom_toBottomOf="@+id/server_status"
             android:layout_marginBottom="8dp"
             app:layout_constraintLeft_toRightOf="@+id/server_status"
-            android:layout_marginLeft="8dp" />
+            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp" />
 
         <fragment
             android:id="@+id/fragment"
             android:name="app.librenews.io.librenews.views.SettingsActivityFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="0dp"
             app:layout_constraintTop_toBottomOf="@+id/toolbar"
-            android:layout_marginLeft="0dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="0dp"
-            android:layout_marginRight="0dp"
-            app:layout_constraintRight_toRightOf="parent" />
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintVertical_bias="0.0" />
 
 
     </android.support.constraint.ConstraintLayout>

+2 -2

LibreNews-App/src/main/res/values-fr/strings.xml

View

@@ -34,11 +34,11 @@
     Les notifications d\'actualités sont parmi les canaux les plus importants par lesquels nous recevons des informations. LibreNews vise à démocratiser ce processus en fournissant un service de notification d\'actualités minimaliste, libre, open source, rapide, sécurisé et décentralisé qui fonctionnera sur presque n\'importe quel smartphone.</p>
     ]]>
     </string>
-    <string name="title_activity_welcome">Welcome to LibreNews</string>
+    <string name="title_activity_welcome">About LibreNews</string>
     <string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>
     <string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>
     <string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>
-    <string name="start_app">START LIBRENEWS</string>
+    <string name="start_app">GO TO LIBRENEWS</string>
     <string name="wifi_sync_only_label">WiFi sync only</string>
     <string name="wifi_sync_only_description">Whether LibreNews should sync only over WiFi (and not over cellular data). A LibreNews sync uses about 9 kB of data (less than 1% of a megabyte).</string>
 

+2 -2

LibreNews-App/src/main/res/values-ja/strings.xml

View

@@ -34,11 +34,11 @@
     最新ニュースの通知は、情報を受け取るために最も重要なチャネルの 1 つです。LibreNews はほぼすべての携帯で動作して、 <i>ミニマリスト、フリー、オープンソース、ファースト、セキュア、 そして 分散 ニュース通知サービス を提供することで、このプロセスを民主化することを目指しています。
     ]]>
     </string>
-    <string name="title_activity_welcome">Welcome to LibreNews</string>
+    <string name="title_activity_welcome">About LibreNews</string>
     <string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>
     <string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>
     <string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>
-    <string name="start_app">START LIBRENEWS</string>
+    <string name="start_app">GO TO LIBRENEWS</string>
     <string name="status_text" formatted="false">syncing every {rate}</string>
     <string name="wifi_sync_only_label">WiFi sync only</string>
     <string name="wifi_sync_only_description">Whether LibreNews should sync only over WiFi (and not over cellular data). A LibreNews sync uses about 9 kB of data (less than 1% of a megabyte).</string>

+3 -2

LibreNews-App/src/main/res/values/strings.xml

View

@@ -35,11 +35,12 @@
     ]]>
     </string>
 
-    <string name="title_activity_welcome">Welcome to LibreNews</string>
+    <string name="title_activity_welcome">About LibreNews</string>
     <string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>
     <string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>
     <string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>
-    <string name="start_app">START LIBRENEWS</string>
+    <string name="start_app">GO TO LIBRENEWS</string>
     <string name="wifi_sync_only_label">WiFi sync only</string>
     <string name="wifi_sync_only_description">Whether LibreNews should sync only over WiFi (and not over cellular data). A LibreNews sync uses about 9 kB of data (less than 1% of a megabyte).</string>
+    <string name="app_info_label">Info</string>
 </resources>

...	...	@@ -67,6 +67,13 @@ public class MainFlashActivity extends AppCompatActivity {
67	67	manager.refresh();
68	68	}
69	69	});
	70	+ findViewById(R.id.app_info).setOnClickListener(new View.OnClickListener() {
	71	+ @Override
	72	+ public void onClick(View view) {
	73	+ Intent intent = new Intent(getApplicationContext(), WelcomeActivity.class);
	74	+ startActivity(intent);
	75	+ }
	76	+ });
70	77	}
71	78
72	79	@Override

...	...	@@ -35,6 +35,21 @@
35	35	app:layout_constraintRight_toRightOf="@+id/toolbar"
36	36	app:layout_constraintTop_toTopOf="@+id/toolbar" />
37	37
	38	+ <Button
	39	+ android:id="@+id/app_info"
	40	+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
	41	+ android:layout_width="56dp"
	42	+ android:layout_height="48dp"
	43	+ android:layout_marginEnd="8dp"
	44	+ android:layout_marginRight="8dp"
	45	+ android:text="@string/app_info_label"
	46	+ android:textColor="@android:color/background_light"
	47	+ app:layout_constraintBottom_toBottomOf="@+id/refresh_button"
	48	+ app:layout_constraintRight_toLeftOf="@+id/refresh_button"
	49	+ app:layout_constraintTop_toTopOf="@+id/refresh_button"
	50	+ tools:layout_editor_absoluteX="224dp"
	51	+ app:layout_constraintVertical_bias="0.0" />
	52	+
38	53	<TextView
39	54	android:id="@+id/server_status"
40	55	android:layout_width="0dp"
...	...	@@ -65,21 +80,20 @@
65	80	app:layout_constraintBottom_toBottomOf="@+id/server_status"
66	81	android:layout_marginBottom="8dp"
67	82	app:layout_constraintLeft_toRightOf="@+id/server_status"
68		- android:layout_marginLeft="8dp" />
	83	+ android:layout_marginLeft="8dp"
	84	+ android:layout_marginStart="8dp" />
69	85
70	86	<fragment
71	87	android:id="@+id/fragment"
72	88	android:name="app.librenews.io.librenews.views.SettingsActivityFragment"
73	89	android:layout_width="0dp"
74	90	android:layout_height="0dp"
75		- android:layout_marginTop="0dp"
76	91	app:layout_constraintTop_toBottomOf="@+id/toolbar"
77		- android:layout_marginLeft="0dp"
78	92	app:layout_constraintLeft_toLeftOf="parent"
79	93	app:layout_constraintBottom_toBottomOf="parent"
80		- android:layout_marginBottom="0dp"
81		- android:layout_marginRight="0dp"
82		- app:layout_constraintRight_toRightOf="parent" />
	94	+ app:layout_constraintRight_toRightOf="parent"
	95	+ app:layout_constraintHorizontal_bias="0.0"
	96	+ app:layout_constraintVertical_bias="0.0" />
83	97
84	98
85	99	</android.support.constraint.ConstraintLayout>

...	...	@@ -34,11 +34,11 @@
34	34	Les notifications d\'actualités sont parmi les canaux les plus importants par lesquels nous recevons des informations. LibreNews vise à démocratiser ce processus en fournissant un service de notification d\'actualités minimaliste, libre, open source, rapide, sécurisé et décentralisé qui fonctionnera sur presque n\'importe quel smartphone.</p>
35	35	]]>
36	36	</string>
37		- <string name="title_activity_welcome">Welcome to LibreNews</string>
	37	+ <string name="title_activity_welcome">About LibreNews</string>
38	38	<string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>
39	39	<string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>
40	40	<string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>
41		- <string name="start_app">START LIBRENEWS</string>
	41	+ <string name="start_app">GO TO LIBRENEWS</string>
42	42	<string name="wifi_sync_only_label">WiFi sync only</string>
43	43	<string name="wifi_sync_only_description">Whether LibreNews should sync only over WiFi (and not over cellular data). A LibreNews sync uses about 9 kB of data (less than 1% of a megabyte).</string>
44	44

...	...	@@ -34,11 +34,11 @@
34	34	最新ニュースの通知は、情報を受け取るために最も重要なチャネルの 1 つです。LibreNews はほぼすべての携帯で動作して、 <i>ミニマリスト、フリー、オープンソース、ファースト、セキュア、そして分散ニュース通知サービスを提供することで、このプロセスを民主化することを目指しています。
35	35	]]>
36	36	</string>
37		- <string name="title_activity_welcome">Welcome to LibreNews</string>
	37	+ <string name="title_activity_welcome">About LibreNews</string>
38	38	<string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>
39	39	<string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>
40	40	<string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>
41		- <string name="start_app">START LIBRENEWS</string>
	41	+ <string name="start_app">GO TO LIBRENEWS</string>
42	42	<string name="status_text" formatted="false">syncing every {rate}</string>
43	43	<string name="wifi_sync_only_label">WiFi sync only</string>
44	44	<string name="wifi_sync_only_description">Whether LibreNews should sync only over WiFi (and not over cellular data). A LibreNews sync uses about 9 kB of data (less than 1% of a megabyte).</string>

...	...	@@ -35,11 +35,12 @@
35	35	]]>
36	36	</string>
37	37
38		- <string name="title_activity_welcome">Welcome to LibreNews</string>
	38	+ <string name="title_activity_welcome">About LibreNews</string>
39	39	<string name="short_description_of_app">LibreNews provides ad-free, decentralized, and secure breaking news notifications.</string>
40	40	<string name="how_to_use">You\'ll mostly interact with LibreNews through its notifications, as the app itself is just settings. \n\nYou\'ll probably get around 3 breaking news notifications per day, if you stick with the default settings.</string>
41	41	<string name="final_notes_welcome_screen">LibreNews doesn\'t track you in any way, and doesn\'t have ads. It\'s completely open source, making the code free for anyone to see.</string>
42		- <string name="start_app">START LIBRENEWS</string>
	42	+ <string name="start_app">GO TO LIBRENEWS</string>
43	43	<string name="wifi_sync_only_label">WiFi sync only</string>
44	44	<string name="wifi_sync_only_description">Whether LibreNews should sync only over WiFi (and not over cellular data). A LibreNews sync uses about 9 kB of data (less than 1% of a megabyte).</string>
	45	+ <string name="app_info_label">Info</string>
45	46	</resources>