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

Replace AboutActivity by Mike Penz About libraries activity

Browse Source
This commit is contained in:
Shinokuni 2019-09-28 13:31:36 +02:00
parent 46a1f83d38
commit ee40b9a072
6 changed files with 32 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,6 @@
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".activities.AboutActivity"
android:label="@string/about"
android:parentActivityName=".activities.MainActivity" />
<activity android:name=".activities.SettingsActivity" />
<activity

42
app/src/main/java/com/readrops/app/activities/AboutActivity.java
View File

@ -1,42 +0,0 @@
package com.readrops.app.activities;
import android.os.Bundle;
import android.view.MenuItem;
import androidx.appcompat.app.AppCompatActivity;
import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder;
import com.readrops.app.R;
public class AboutActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
new LibsBuilder()
.withAboutIconShown(true)
.withAboutVersionShown(true)
.withAboutAppName(getString(R.string.app_name))
.withAboutDescription(getString(R.string.app_description, getString(R.string.app_licence), getString(R.string.app_url)))
.withLicenseShown(true)
.withLicenseDialog(false)
.withActivityTitle(getString(R.string.about))
.withActivityStyle(Libs.ActivityStyle.LIGHT)
.withFields(R.string.class.getFields())
.start(this);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

24
app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -30,6 +30,8 @@ import com.afollestad.materialdialogs.MaterialDialog;
import com.bumptech.glide.Glide;
import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
import com.bumptech.glide.util.ViewPreloadSizeProvider;
import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder;
import com.mikepenz.materialdrawer.Drawer;
import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
@ -158,6 +160,13 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
intent.putExtra("fromMainActivity", true);
startActivityForResult(intent, ADD_ACCOUNT_REQUEST);
break;
case DrawerManager.ACCOUNT_SETTINGS_ID:
Intent intent1 = new Intent(this, SettingsActivity.class);
intent1.putExtra(SettingsActivity.SETTINGS_KEY,
SettingsActivity.SettingsKey.ACCOUNT_SETTINGS.ordinal());
intent1.putExtra(AccountSettingsFragment.ACCOUNT, viewModel.getCurrentAccount());
startActivity(intent1);
break;
default:
if (!updating) {
viewModel.setCurrentAccount(id);
@ -225,7 +234,7 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
viewModel.invalidate();
break;
case DrawerManager.ABOUT_ID:
startActivity(new Intent(getApplication(), AboutActivity.class));
startAboutActivity();
break;
case DrawerManager.SETTINGS_ID:
Intent intent = new Intent(getApplication(), SettingsActivity.class);
@ -656,6 +665,19 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
}
}
private void startAboutActivity() {
new LibsBuilder()
.withAboutIconShown(true)
.withAboutVersionShown(true)
.withAboutAppName(getString(R.string.app_name))
.withAboutDescription(getString(R.string.app_description, getString(R.string.app_licence), getString(R.string.app_url)))
.withLicenseShown(true)
.withLicenseDialog(false)
.withActivityTitle(getString(R.string.about))
.withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
.withFields(R.string.class.getFields())
.start(this);
}
@Override
protected void onDestroy() {

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

@ -42,6 +42,7 @@ public class DrawerManager {
public static final int ADD_ACCOUNT_ID = -4;
public static final int ABOUT_ID = -7;
public static final int SETTINGS_ID = -8;
public static final int ACCOUNT_SETTINGS_ID = -9;
private Activity activity;
private Toolbar toolbar;
@ -144,10 +145,15 @@ public class DrawerManager {
.withIcon(R.drawable.ic_add_account_grey)
.withIdentifier(ADD_ACCOUNT_ID);
ProfileSettingDrawerItem accountSettingsItem = new ProfileSettingDrawerItem()
.withName(R.string.account_settings)
.withIcon(R.drawable.ic_settings)
.withIdentifier(ACCOUNT_SETTINGS_ID);
header = new AccountHeaderBuilder()
.withActivity(activity)
.addProfiles(profileItems)
.addProfiles(addAccountSettingsItem)
.addProfiles(accountSettingsItem, addAccountSettingsItem)
.withDividerBelowHeader(false)
.withAlternativeProfileHeaderSwitching(true)
.withCurrentProfileHiddenInList(true)

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

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.AboutActivity">
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/styles.xml
View File

@ -9,6 +9,8 @@
<item name="android:colorBackground">@color/colorBackground</item>
<item name="colorControlNormal">@color/colorControlNormal</item>
<item name="android:textColorPrimary">@color/textColorPrimary</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
</style>
<style name="AppTheme.NoActionBar" parent="AppTheme">