Update for Release 0.0.0.5

Fixed clash of attribute names #6 by adding a library specific prefix (breaking change) and removing some unused attributes Fixed some Typos in docs Updated some library versions Fixed release signing Typo Updated sdk version as required by some libraries
Zardozz · Jan 19, 2022 · 1094567 · 1094567
1 parent 2072405
commit 1094567
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 72 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -34,4 +34,4 @@ Every contribution is welcome to the library. Simply [open a new Pull Request](h
 Note that by making a contribution to this project you are agreeing to have your contributions governed by the [MIT License](https://github.com/Zardozz/FixedHeaderTableLayout/blob/master/LICENSE) copyright statement.
 This means that to the extent possible under law, you transfer all copyright and related or neighbouring rights of the code or documents you contribute to the project itself. You also represent that you have the authority to perform the above waiver with respect to the entirety of you contributions.
 
-Ideally contributions should have an demo of any new feature in the Demo App (that can be turned on or off if it impacts other feature demos) and or some automated tests related to the contribution
+Ideally contributions should have a demo of any new feature in the Demo App (that can be turned on/off or a separate demo if it impacts other feature demos) and or some automated tests related to the contribution
diff --git a/README.md b/README.md
@@ -66,7 +66,6 @@ Add Maven Central to the project's `build.gradle` :
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }
@@ -75,7 +74,7 @@ allprojects {
 Add the following dependency into your module's `build.gradle`:
 ```
 dependencies {
-    implementation 'com.github.Zardozz:fixedheadertablelayout:0.0.0.4'
+    implementation 'com.github.Zardozz:fixedheadertablelayout:0.0.0.5'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,21 +28,23 @@ plugins {
 
 File keystorePropertiesFile = project.rootProject.file('local.properties')
 if (keystorePropertiesFile.exists()) {
+    System.out.println('Signing Keyfile exists ')
     def keystoreProperties = new Properties()
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
     // If the property file has enough properties to enable releasing
     if (keystoreProperties['keystore'] != null &&
             keystoreProperties['keystore.storePassword'] != null &&
             keystoreProperties['keystore.keyAlias'] != null &&
-            keystoreProperties['keystore.password'] != null
+            keystoreProperties['keystore.keyPassword'] != null
     ) {
+        System.out.println('Keyfile has enough properties')
         android {
             signingConfigs {
                 release {
                     storeFile file(keystoreProperties['keystore'])
                     storePassword keystoreProperties['keystore.storePassword']
                     keyAlias keystoreProperties['keystore.keyAlias']
-                    keyPassword keystoreProperties['keystore.password']
+                    keyPassword keystoreProperties['keystore.keyPassword']
                 }
             }
         }
@@ -64,14 +66,14 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.github.zardozz.fixedheadertablelayoutsample"
         minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 4
-        versionName "0.0.0.4"
+        targetSdkVersion 31
+        versionCode 5
+        versionName "0.0.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -91,11 +93,11 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
     implementation project(path: ':fixedheadertablelayout')
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/app/src/main/res/layout/activity_main_example.xml b/app/src/main/res/layout/activity_main_example.xml
@@ -38,6 +38,7 @@
         android:fadeScrollbars="true"
         android:scrollbarSize="10dp"
         android:scrollbarStyle="insideOverlay"
+        app:fhtl_max_scale="1.5"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

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

diff --git a/fixedheadertablelayout/build.gradle b/fixedheadertablelayout/build.gradle
@@ -28,7 +28,7 @@ plugins {
 
 ext {
     PUBLISH_GROUP_ID = 'com.github.Zardozz'
-    PUBLISH_VERSION = '0.0.0.4'
+    PUBLISH_VERSION = '0.0.0.5'
     PUBLISH_ARTIFACT_ID = 'fixedheadertablelayout'
 }
 
@@ -42,15 +42,15 @@ if (keystorePropertiesFile.exists()) {
     if (keystoreProperties['keystore'] != null &&
             keystoreProperties['keystore.storePassword'] != null &&
             keystoreProperties['keystore.keyAlias'] != null &&
-            keystoreProperties['keystore.password'] != null
+            keystoreProperties['keystore.keyPassword'] != null
     ) {
         android {
             signingConfigs {
                 release {
                     storeFile file(keystoreProperties['keystore'])
                     storePassword keystoreProperties['keystore.storePassword']
                     keyAlias keystoreProperties['keystore.keyAlias']
-                    keyPassword keystoreProperties['keystore.password']
+                    keyPassword keystoreProperties['keystore.keyPassword']
                 }
             }
         }
@@ -72,11 +72,11 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -99,7 +99,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:rules:1.4.0'

diff --git a/...ayout/src/main/java/com/github/zardozz/FixedHeaderTableLayout/FixedHeaderTableLayout.java b/...ayout/src/main/java/com/github/zardozz/FixedHeaderTableLayout/FixedHeaderTableLayout.java
@@ -79,30 +79,6 @@ public class FixedHeaderTableLayout extends FrameLayout implements ScaleGestureD
     private float scaledRightBound;
     private float scaledBottomBound;
 
-    private CornerViewLocation mCornerViewLocation;
-
-    private boolean mReverseLayout = false;
-
-    public enum CornerViewLocation {
-        TOP_LEFT(0),
-        TOP_RIGHT(1),
-        BOTTOM_LEFT(2),
-        BOTTOM_RIGHT(3);
-        int id;
-
-        CornerViewLocation(int id) {
-            this.id = id;
-        }
-
-        static CornerViewLocation fromId(int id) {
-            for (CornerViewLocation c : values()) {
-                if (c.id == id) return c;
-            }
-            // If enum not found return default of Top Left
-            return TOP_LEFT;
-        }
-    }
-
     private static final String LOG_TAG = FixedHeaderTableLayout.class.getSimpleName();
 
 
@@ -130,33 +106,20 @@ private void initialDefaultValues(@Nullable AttributeSet attrs) {
             return;
         }
 
-        // Cornerview location
-        mCornerViewLocation = FixedHeaderTableLayout.CornerViewLocation.TOP_LEFT;
-
-        // Reverse Layout
-        mReverseLayout = false;
-
         // Get values from xml attributes
         TypedArray a = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable
                 .FixedHeaderTableLayout, 0, 0);
 
         try {
-            minScale = a.getFloat(R.styleable.FixedHeaderTableLayout_min_scale, minScale);
-            maxScale = a.getFloat(R.styleable.FixedHeaderTableLayout_max_scale, maxScale);
-
-            // CornerView location
-            mCornerViewLocation = CornerViewLocation.fromId(a.getInt(R.styleable.FixedHeaderTableLayout_corner_view_location, 0));
-
-            // Reverse Layout
-            mReverseLayout = a.getBoolean(R.styleable.FixedHeaderTableLayout_reverse_layout, mReverseLayout);
-
+            minScale = a.getFloat(R.styleable.FixedHeaderTableLayout_fhtl_min_scale, minScale);
+            maxScale = a.getFloat(R.styleable.FixedHeaderTableLayout_fhtl_max_scale, maxScale);
         } finally {
             a.recycle();
         }
     }
 
     private void init(Context context){
-        Log.d(LOG_TAG, "mainTable:init");
+       //Log.d(LOG_TAG, "mainTable:init");
 
         // Get our current View slop for Scrolling
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();

diff --git a/fixedheadertablelayout/src/main/res/values/attrs.xml b/fixedheadertablelayout/src/main/res/values/attrs.xml
@@ -25,15 +25,8 @@
 
 <resources>
     <declare-styleable name="FixedHeaderTableLayout">
-        <attr name="min_scale" format="float"/>
-        <attr name="max_scale" format="float"/>
-        <attr name="corner_view_location">
-            <enum name="top_left" value="0"/>
-            <enum name="top_right" value="1"/>
-            <enum name="bottom_left" value="2"/>
-            <enum name="bottom_right" value="3"/>
-        </attr>
-        <attr name="reverse_layout" format="boolean" />
+        <attr name="fhtl_min_scale" format="float"/>
+        <attr name="fhtl_max_scale" format="float"/>
     </declare-styleable>
 
 </resources>