Skip to content

Commit

Permalink
Prepare for 0.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
jeketos committed Jan 19, 2023
1 parent 2ca6a90 commit d04fa36
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 54 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.gradle/
build/
local.properties
publish/
*.log
captures/
.externalNativeBuild/
Expand Down
9 changes: 8 additions & 1 deletion auto-size-text/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,11 @@ android {
dependencies {
implementation "androidx.compose.ui:ui:1.3.3"
implementation 'androidx.compose.material3:material3:1.1.0-alpha04'
}
}
ext {
PUBLISH_GROUP_ID = 'com.idapgroup'
PUBLISH_VERSION = '0.1.0'
PUBLISH_ARTIFACT_ID = 'autosizetext-compose'
}

apply from: "${rootProject.projectDir}/publish/module.gradle"
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ buildscript {
compose_version = '1.3.3'
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.3.1' apply false
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
}
id 'io.github.gradle-nexus.publish-plugin' version "1.1.0"
}
apply from: "${rootDir}/publish/publish.gradle"
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
android.useAndroidX=true
android.enableJetifier=true
5 changes: 3 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ android {
}

dependencies {

implementation(project(":auto-size-text"))
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.activity:activity-compose:1.6.1'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.compose.material3:material3:1.1.0-alpha04'

//Most useful dependency
implementation 'com.idapgroup:autosizetext-compose:0.1.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ package com.idapgroup.autosizetext.sample
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.*
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
Expand All @@ -18,6 +15,14 @@ import androidx.compose.ui.unit.sp
import com.idapgroup.autosizetext.AutoSizeText
import com.idapgroup.autosizetext.sample.ui.theme.AutoSizeTextTheme

private const val longText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer " +
"feugiat, ligula a volutpat dictum, velit est cursus erat, non eleifend dui leo " +
"nec diam. Vestibulum aliquet accumsan mollis. Praesent pellentesque lacinia " +
"pretium. Ut nec convallis tortor. Duis quis venenatis justo. Integer convallis " +
"ipsum dolor, in dignissim diam malesuada at. Praesent ac lacus neque. Praesent " +
"imperdiet ultricies purus sagittis accumsan. Vivamus dignissim orci ut metus " +
"tristique porttitor. In vel auctor ipsum."

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down Expand Up @@ -50,22 +55,24 @@ fun Greeting() {
minFontSize = 8.sp
)
AutoSizeText(
modifier = Modifier.height(100.dp),
text = longText,
fontSize = 40.sp,
)
AutoSizeText(
modifier = Modifier.height(40.dp),
text = longText,
maxLines = 4,
fontSize = 40.sp,
)
Box(modifier = Modifier.height(40.dp)) {
AutoSizeText(
text = longText,
fontSize = 40.sp,
)
}
}
}

private val longText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer " +
"feugiat, ligula a volutpat dictum, velit est cursus erat, non eleifend dui leo " +
"nec diam. Vestibulum aliquet accumsan mollis. Praesent pellentesque lacinia " +
"pretium. Ut nec convallis tortor. Duis quis venenatis justo. Integer convallis " +
"ipsum dolor, in dignissim diam malesuada at. Praesent ac lacus neque. Praesent " +
"imperdiet ultricies purus sagittis accumsan. Vivamus dignissim orci ut metus " +
"tristique porttitor. In vel auctor ipsum."


@Preview(showBackground = true)
@Composable
fun DefaultPreview() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,11 @@ private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40

/* Other default colors to override
background = Color(0xFFFFFBFE),
surface = Color(0xFFFFFBFE),
onPrimary = Color.White,
onSecondary = Color.White,
onTertiary = Color.White,
onBackground = Color(0xFF1C1B1F),
onSurface = Color(0xFF1C1B1F),
*/
)

@Composable
fun AutoSizeTextTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
// Dynamic color is available on Android 12+
dynamicColor: Boolean = true,
content: @Composable () -> Unit
) {
Expand All @@ -52,14 +41,6 @@ fun AutoSizeTextTheme(
darkTheme -> DarkColorScheme
else -> LightColorScheme
}
val view = LocalView.current
if (!view.isInEditMode) {
SideEffect {
(view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
}
}

MaterialTheme(
colorScheme = colorScheme,
typography = Typography,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp

// Set of Material typography styles to start with
val Typography = Typography(
bodyLarge = TextStyle(
fontFamily = FontFamily.Default,
Expand All @@ -15,20 +14,4 @@ val Typography = Typography(
lineHeight = 24.sp,
letterSpacing = 0.5.sp
)
/* Other default text styles to override
titleLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 22.sp,
lineHeight = 28.sp,
letterSpacing = 0.sp
),
labelSmall = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Medium,
fontSize = 11.sp,
lineHeight = 16.sp,
letterSpacing = 0.5.sp
)
*/
)

0 comments on commit d04fa36

Please sign in to comment.