Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: KeePassDroid with new and shiny material design #238

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: KeePassDroid with new and shiny material design #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c12a0
Start implementing material design.
ibiBgOR Nov 11, 2017
87416bd
Materialized start view.
ibiBgOR May 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ android {
buildToolsVersion = '26.0.2'

defaultConfig {
applicationId = "com.android.keepass"
minSdkVersion 4
applicationId = "com.android.keepass.test"
minSdkVersion 7
targetSdkVersion 12

versionCode = 158
versionName = "2.2.0.2"
versionCode = 159
versionName = "2.2.0.3-SNAPSHOT"

testApplicationId = "com.keepassdroid.tests"
testInstrumentationRunner = "android.test.InstrumentationTestRunner"
Expand All @@ -35,7 +35,7 @@ android {
productFlavors {
flavor1 {
dimension = "all"
applicationId = "com.android.keepass"
applicationId = "com.android.keepass.test"
}
}

Expand All @@ -48,6 +48,8 @@ dependencies {
compile 'com.madgag.spongycastle:core:1.58.0.0'
compile 'com.madgag.spongycastle:prov:1.58.0.0'
compile 'joda-time:joda-time:2.9.4'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:design:23.4.0'

}
75 changes: 51 additions & 24 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,20 @@
android:backupAgent="com.keepassdroid.backup.SettingsBackupAgent">
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIKwReNelmy5SvhZzK3bpK_JisjzUko6cL_8GR4w" />
<activity android:name=".KeePass"
android:label="@string/app_name">
<activity
android:name=".KeePass"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.keepassdroid.fileselect.FileSelectActivity" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"
android:theme="@style/AppTheme"
/>
<activity android:name="com.keepassdroid.PasswordActivity" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar">
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
Expand Down Expand Up @@ -68,45 +70,70 @@
</intent-filter>
</activity>
<activity android:name="com.keepassdroid.GroupActivityV3" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar">
android:theme="@style/AppTheme">
<!-- This metadata entry causes .app.SearchQueryResults to be the default context -->
<!-- whenever the user invokes search while in this Activity. -->
<meta-data android:name="android.app.default_searchable"
android:value="com.keepassdroid.search.SearchResults" />
</activity>
<activity android:name="com.keepassdroid.GroupActivityV4" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar">
android:theme="@style/AppTheme">
<!-- This metadata entry causes .app.SearchQueryResults to be the default context -->
<!-- whenever the user invokes search while in this Activity. -->
<meta-data android:name="android.app.default_searchable"
android:value="com.keepassdroid.search.SearchResults"
android:exported="false" />
</activity>
<activity android:name="com.keepassdroid.EntryActivity" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.EntryActivityV4" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.LockingActivity"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.EntryEditActivityV3" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.EntryEditActivityV4" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.GroupEditActivity" android:theme="@style/Dialog"></activity>
<activity android:name="com.keepassdroid.IconPickerActivity" android:theme="@style/NoTitleBar"></activity>
<activity
android:name="com.keepassdroid.EntryActivity"
android:configChanges="orientation|keyboardHidden"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.EntryActivityV4"
android:configChanges="orientation|keyboardHidden"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.LockingActivity"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.EntryEditActivityV3"
android:configChanges="orientation|keyboardHidden"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.EntryEditActivityV4"
android:configChanges="orientation|keyboardHidden"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.GroupEditActivity"
android:theme="@style/Dialog" />
<activity
android:name="com.keepassdroid.IconPickerActivity"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.fileselect.CreateDatabaseActivity"
android:label="@string/create_database"
android:theme="@style/AppTheme"
android:parentActivityName="com.keepassdroid.fileselect.FileSelectActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.keepassdroid.fileselect.FileSelectActivity" />
</activity>
<activity android:name="com.keepassdroid.search.SearchResults" android:launchMode="standard"
android:theme="@style/NoTitleBar">
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
</activity>
<activity android:name="com.keepassdroid.settings.AppSettingsActivity"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.GeneratePasswordActivity"
android:theme="@style/NoTitleBar"></activity>
<service android:name="com.keepassdroid.services.TimeoutService"></service>
<activity
android:name="com.keepassdroid.settings.AppSettingsActivity"
android:theme="@style/AppTheme" />
<activity
android:name="com.keepassdroid.GeneratePasswordActivity"
android:theme="@style/AppTheme" />

<service android:name="com.keepassdroid.services.TimeoutService" />
<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL" android:value="http://keepassdroid.com" />
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
</application>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/android/keepass/KeePass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
*/
package com.android.keepass;

import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import com.keepassdroid.fileselect.FileSelectActivity;

public class KeePass extends Activity {
public class KeePass extends AppCompatActivity {

public static final int EXIT_NORMAL = 0;
public static final int EXIT_LOCK = 1;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/keepassdroid/GroupEditActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.ImageButton;
Expand All @@ -31,8 +32,7 @@
import com.android.keepass.R;
import com.keepassdroid.icons.Icons;

public class GroupEditActivity extends Activity
{
public class GroupEditActivity extends AppCompatActivity {
public static final String KEY_NAME = "name";
public static final String KEY_ICON_ID = "icon_id";

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/keepassdroid/LockingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
package com.keepassdroid;

import android.app.Activity;
import android.support.v7.app.AppCompatActivity;

import com.keepassdroid.timeout.TimeoutHelper;

public abstract class LockingActivity extends Activity {
public abstract class LockingActivity extends AppCompatActivity {

@Override
protected void onPause() {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/keepassdroid/compat/StorageAF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/
package com.keepassdroid.compat;

import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
Expand All @@ -28,6 +29,8 @@

import java.lang.reflect.Field;

import static android.os.Build.VERSION_CODES.LOLLIPOP;

/**
* Created by bpellin on 3/10/16.
*/
Expand Down
Loading