git push origin masterMerge branch 'Henne1191-master'

SecUSo · Mar 19, 2018 · 8d12912 · 8d12912
2 parents 7167ee2 + 1ad9776
commit 8d12912
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Version 1.0.2 *(2018-03-19)*
+----------------------------
+
+ * Fixing Search View
+
 Version 1.0.1 *(2017-12-28)*
 ----------------------------
 

diff --git a/README.md b/README.md
@@ -66,10 +66,13 @@ The icons used in the nagivation drawer are licensed under the [CC BY 2.5](http:
 App-Icon: <br />
 Markus Hau<br />
 
+Developer: <br />
+Yonjuni (Karola Marky) <br />
+
 Github-Users: <br />
-Yonjuni<br />
 Naofum <br />
-mohammadnaseri
+mohammadnaseri <br />
+Henne1191
 
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "org.secuso.privacyfriendlypasswordgenerator"
         minSdkVersion 17
-        targetSdkVersion 25
-        versionCode 2
-        versionName "1.0.1"
+        targetSdkVersion 27
+        versionCode 3
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -30,11 +30,11 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:design:25.2.0'
-    compile 'com.android.support:support-core-utils:25.2.0'
-    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'com.android.support:cardview-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.android.support:design:27.1.0'
+    compile 'com.android.support:support-core-utils:27.1.0'
+    compile 'com.android.support:recyclerview-v7:27.1.0'
+    compile 'com.android.support:cardview-v7:27.1.0'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     testCompile 'junit:junit:4.12'

diff --git a/app/src/main/java/org/secuso/privacyfriendlypasswordgenerator/activities/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlypasswordgenerator/activities/MainActivity.java
@@ -124,7 +124,7 @@ public void onItemClick(View view, int position) {
                         Bundle bundle = new Bundle();
 
                         //Gets ID for look up in DB
-                        MetaData temp = metadatalist.get(position);
+                        MetaData temp = adapter.getItem(position);
 
                         bundle.putInt("position", temp.getID());
                         bundle.putString("hash_algorithm", hash_algorithm);

diff --git a/app/src/main/java/org/secuso/privacyfriendlypasswordgenerator/helpers/MetaDataAdapter.java b/app/src/main/java/org/secuso/privacyfriendlypasswordgenerator/helpers/MetaDataAdapter.java
@@ -131,6 +131,10 @@ public void setMetaDataList(List<MetaData> metaDataList) {
         this.metaDataList = metaDataList;
     }
 
+    public MetaData getItem(int position) {
+        return metaDataList.get(position);
+    }
+
     public MetaData removeItem(int position) {
         final MetaData metaData = metaDataList.remove(position);
         notifyItemRemoved(position);

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -53,7 +53,6 @@
                         android:id="@+id/barcodeLogo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:adjustViewBounds="true"
                         android:src="@drawable/privacyfriendlyappslogo" />
 
                 </LinearLayout>

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sat Mar 04 16:29:48 CET 2017
+#Mon Mar 19 18:10:14 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb