Skip to content

Commit

Permalink
v1.20
Browse files Browse the repository at this point in the history 
Make wallpaper colours selectable.
Add preset colours from AEX.
Support Oreo & above. (Tested only on Pie and 10 atm)
Minor UI & UX improvements.
  • Loading branch information
@Akilesh-T
Akilesh-T committed Dec 7, 2019
1 parent d48889c commit cc52794
Show file tree
Hide file tree
Showing 8 changed files with 443 additions and 199 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ android {
viewBinding.enabled = true
defaultConfig {
applicationId "app.akilesh.qacc"
minSdkVersion 29
minSdkVersion 26
targetSdkVersion 29
versionCode 3
versionName "1.10"
versionCode 4
versionName "1.20"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
266 changes: 174 additions & 92 deletions app/src/main/java/app/akilesh/qacc/MainActivity.kt
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_build.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
</vector>
221 changes: 130 additions & 91 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,55 @@
android:textColor="@android:color/white"
android:text="@string/current_accent" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/enable_accent"
style="@style/Cards">
<com.google.android.material.textview.MaterialTextView
style="@style/Text"
android:id="@+id/current_accent" />

<androidx.appcompat.widget.LinearLayoutCompat
android:paddingTop="30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">

<androidx.appcompat.widget.LinearLayoutCompat
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_current"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_color"/>

<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="8dp"
android:paddingEnd="0dp"
android:maxLines="1"
android:id="@+id/current_accent" />
</androidx.appcompat.widget.LinearLayoutCompat>

<com.google.android.material.button.MaterialButton
android:id="@+id/enable_accent"
android:layout_margin="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:textAllCaps="false"
android:textColor="?colorOnBackground"
android:text="@string/enable"/>

</androidx.appcompat.widget.LinearLayoutCompat>

</com.google.android.material.card.MaterialCardView>

</FrameLayout>


<FrameLayout
android:id="@+id/wall_frame"
android:id="@+id/wallFrame"
android:clipChildren="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -66,83 +103,30 @@
android:text="@string/color_wallpaper" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/wall_colors"
style="@style/Cards">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="30dp"
android:paddingStart="30dp"
android:paddingEnd="0dp"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_color"/>

<com.google.android.material.textview.MaterialTextView
android:id="@+id/wall_color_primary"
android:layout_height="wrap_content"
android:id="@+id/preview_wall"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="30dp"
android:paddingEnd="0dp"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingStart="30dp"
android:paddingEnd="0dp"
app:srcCompat="@drawable/ic_color"/>

<com.google.android.material.textview.MaterialTextView
android:id="@+id/wall_color_secondary"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="16dp"
android:paddingStart="30dp"
android:paddingEnd="0dp"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_color"/>
style="@style/Text"
android:id="@+id/wall_text"
android:text="@string/set_wallpaper_color"/>

<com.google.android.material.textview.MaterialTextView
android:id="@+id/wall_color_tertiary"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>

</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>

Expand All @@ -169,6 +153,7 @@

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_light"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="30dp"
Expand All @@ -195,35 +180,37 @@
<com.google.android.material.textview.MaterialTextView
style="@style/CardHeaders"
android:textColor="@android:color/white"
android:text="@string/color_dark" />
android:text="@string/presets" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/dark"
android:id="@+id/preset"
style="@style/Cards">

<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="30dp"
android:paddingEnd="0dp"
app:srcCompat="@drawable/ic_color"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_preset"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="30dp"
android:paddingEnd="0dp"
app:srcCompat="@drawable/ic_color"/>

<com.google.android.material.textview.MaterialTextView
style="@style/Text"
android:id="@+id/darkText"
android:text="@string/set_color_dark"/>
<com.google.android.material.textview.MaterialTextView
style="@style/Text"
android:id="@+id/presetText"
android:text="@string/set_preset_color"/>

</androidx.appcompat.widget.LinearLayoutCompat>

</com.google.android.material.card.MaterialCardView>

</FrameLayout>


<FrameLayout
android:clipChildren="false"
android:layout_width="match_parent"
Expand All @@ -238,26 +225,78 @@
app:boxStrokeColor="@color/colorPrimaryDark"
app:boxStrokeWidth="1dp"
android:importantForAutofill="noExcludeDescendants"
android:hint="@string/color_name">
app:helperText="@string/color_name">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/name"
android:maxLines="1"
android:inputType="text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>

</FrameLayout>

<com.google.android.material.button.MaterialButton
android:layout_marginTop="16dp"
android:layout_marginBottom="54dp"
android:layout_width="wrap_content"

<FrameLayout
android:clipChildren="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="@string/create"
android:textAllCaps="false"
android:layout_gravity="center"
android:id="@+id/button"/>
android:layout_marginTop="16dp"
android:layout_marginBottom="24dp">

<com.google.android.material.textview.MaterialTextView
style="@style/CardHeaders"
android:textColor="@android:color/white"
android:text="@string/selected" />
<com.google.android.material.card.MaterialCardView
style="@style/Cards">

<androidx.appcompat.widget.LinearLayoutCompat
android:paddingTop="30dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">

<androidx.appcompat.widget.LinearLayoutCompat
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/preview_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_color"/>

<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="8dp"
android:paddingEnd="0dp"
android:maxLines="1"
android:id="@+id/preview_selected_text" />
</androidx.appcompat.widget.LinearLayoutCompat>

<com.google.android.material.button.MaterialButton
android:id="@+id/create"
android:layout_margin="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
app:icon="@drawable/ic_build"
app:iconTint="?colorOnBackground"
android:textAllCaps="false"
android:textColor="?colorOnBackground"
android:text="@string/create"/>

</androidx.appcompat.widget.LinearLayoutCompat>

</com.google.android.material.card.MaterialCardView>

</FrameLayout>

</androidx.appcompat.widget.LinearLayoutCompat>

Expand Down
Loading

0 comments on commit cc52794

Please sign in to comment.