FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add titles to activites

Browse Source
This commit is contained in:
Shinokuni 2019-07-12 15:42:42 +02:00
parent 142d0f19cf
commit ef8176b324
7 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View File

@ -29,12 +29,16 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".activities.AccountTypeListActivity" /> <activity android:name=".activities.AccountTypeListActivity" />
<activity android:name=".activities.AddAccountActivity" /> <activity
android:name=".activities.AddAccountActivity"
android:label="@string/add_account" />
<activity <activity
android:name=".activities.ManageFeedsActivity" android:name=".activities.ManageFeedsActivity"
android:label="@string/manage_feeds_folders"
android:parentActivityName=".activities.MainActivity" /> android:parentActivityName=".activities.MainActivity" />
<activity <activity
android:name=".activities.MainActivity" android:name=".activities.MainActivity"
android:label="@string/articles"
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".activities.ItemActivity" android:name=".activities.ItemActivity"
@ -42,6 +46,7 @@
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".activities.AddFeedActivity" android:name=".activities.AddFeedActivity"
android:label="@string/add_feed_title"
android:parentActivityName=".activities.MainActivity" /> android:parentActivityName=".activities.MainActivity" />
</application> </application>

2
app/src/main/java/com/readrops/app/activities/AccountSettingsActivity.java
View File

@ -24,6 +24,8 @@ public class AccountSettingsActivity extends AppCompatActivity {
binding = DataBindingUtil.setContentView(this, R.layout.activity_account_settings); binding = DataBindingUtil.setContentView(this, R.layout.activity_account_settings);
Account account = getIntent().getParcelableExtra(ACCOUNT); Account account = getIntent().getParcelableExtra(ACCOUNT);
setTitle(account.getAccountName());
binding.accountSettingsFeeds.setOnClickListener(v -> { binding.accountSettingsFeeds.setOnClickListener(v -> {
Intent intent = new Intent(getApplication(), ManageFeedsActivity.class); Intent intent = new Intent(getApplication(), ManageFeedsActivity.class);
intent.putExtra(ManageFeedsActivity.ACCOUNT, account); intent.putExtra(ManageFeedsActivity.ACCOUNT, account);

1
app/src/main/java/com/readrops/app/utils/DrawerManager.java
View File

@ -177,7 +177,6 @@ public class DrawerManager {
.withIcon(color != 0 ? drawableWithColor(color) : drawableWithColor(activity.getResources().getColor(R.color.colorPrimary))) .withIcon(color != 0 ? drawableWithColor(color) : drawableWithColor(activity.getResources().getColor(R.color.colorPrimary)))
.withIdentifier(feed.getId()); .withIdentifier(feed.getId());
Glide.with(activity) Glide.with(activity)
.load(feed.getIconUrl()) .load(feed.getIconUrl())
.into(new CustomTarget<Drawable>() { .into(new CustomTarget<Drawable>() {

6
app/src/main/res/drawable/cell_separator.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/darker_gray" />
</shape>

9
app/src/main/res/layout/activity_account_settings.xml
View File

@ -23,9 +23,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/feeds" /> android:text="@string/feeds_and_folders" />
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@drawable/cell_separator"
app:layout_constraintBottom_toTopOf="@id/account_settings_account"
app:layout_constraintTop_toBottomOf="@id/account_settings_feeds" />
<RelativeLayout <RelativeLayout
android:id="@+id/account_settings_account" android:id="@+id/account_settings_account"
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/values-fr-rFR/strings.xml
View File

@ -59,7 +59,8 @@
<string name="no_feed">Aucun flux</string> <string name="no_feed">Aucun flux</string>
<string name="choose_account">Choisir un compte</string> <string name="choose_account">Choisir un compte</string>
<string name="local_account">Compte local</string> <string name="local_account">Compte local</string>
<string name="feeds">Flux</string> <string name="feeds_and_folders">Flux et dossiers</string>
<string name="account">Compte</string> <string name="account">Compte</string>
<string name="manage_feeds_folders">Gérer les flux et dossiers</string>
</resources> </resources>

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

@ -64,6 +64,7 @@
<string name="local_account">Local account</string> <string name="local_account">Local account</string>
<string name="freshrss" translatable="false">Freshrss</string> <string name="freshrss" translatable="false">Freshrss</string>
<string name="feedly" translatable="false">Feedly</string> <string name="feedly" translatable="false">Feedly</string>
<string name="feeds">Feeds</string> <string name="feeds_and_folders">Feeds and folders</string>
<string name="account">Account</string> <string name="account">Account</string>
<string name="manage_feeds_folders">Manage feeds and folders</string>
</resources> </resources>