Skip to content

Commit

Permalink
refactored package name, added public styles
Browse files Browse the repository at this point in the history
  • Loading branch information
vokod authored and awolity committed Feb 20, 2019
1 parent f220bd3 commit 942ca7d
Show file tree
Hide file tree
Showing 56 changed files with 81 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':settingsviews')
implementation project(path: ':settingviews')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.core:core-ktx:1.1.0-alpha04'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import android.os.Bundle
import android.widget.CompoundButton
import android.widget.SeekBar
import android.widget.Toast
import com.awolity.settingsviews.RadiogroupSetting
import com.awolity.settingviews.RadiogroupSetting
import kotlinx.android.synthetic.main.activity_main.*
import kotlin.random.Random

Expand Down
10 changes: 5 additions & 5 deletions demo/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
app:layout_constraintTop_toBottomOf="@+id/btn_change_title_color"/>


<com.awolity.settingsviews.ButtonSetting
<com.awolity.settingviews.ButtonSetting
android:id="@+id/bs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -98,7 +98,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

<com.awolity.settingsviews.SwitchSetting
<com.awolity.settingviews.SwitchSetting
android:id="@+id/ss"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -111,9 +111,9 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@+id/bs">
</com.awolity.settingsviews.SwitchSetting>
</com.awolity.settingviews.SwitchSetting>

<com.awolity.settingsviews.RadiogroupSetting
<com.awolity.settingviews.RadiogroupSetting
android:id="@+id/rs"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -132,7 +132,7 @@
app:layout_constraintTop_toBottomOf="@+id/ss"/>


<com.awolity.settingsviews.SeekbarSetting
<com.awolity.settingviews.SeekbarSetting
android:id="@+id/es"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':demo', ':settingsviews'
include ':demo', ':settingviews'
4 changes: 0 additions & 4 deletions settingsviews/src/main/res/values/public.xml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.DrawableMatcher.withDrawable
import com.awolity.settingviews.DrawableMatcher.withDrawable
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_attributes_bs.*

@RunWith(AndroidJUnit4::class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import android.content.pm.ActivityInfo
Expand All @@ -11,7 +11,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_bs.*
import org.hamcrest.CoreMatchers.not
import java.lang.IllegalStateException
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
Expand All @@ -10,7 +10,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_bs.*
import org.hamcrest.CoreMatchers.not
import java.lang.IllegalStateException
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews;
package com.awolity.settingviews;

import android.content.res.Resources;
import android.graphics.Bitmap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.DrawableMatcher.withDrawable
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.DrawableMatcher.withDrawable
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_attributes_rs.*
import org.hamcrest.CoreMatchers.not
import org.junit.Before
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import android.content.pm.ActivityInfo
Expand All @@ -12,7 +12,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_bs.*
import kotlinx.android.synthetic.main.activity_mock_defaults_rs.*
import org.hamcrest.CoreMatchers.not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
Expand All @@ -7,7 +7,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import junit.framework.Assert.fail
import kotlinx.android.synthetic.main.activity_mock_defaults_rs.*
import org.hamcrest.CoreMatchers.not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_ses.*
import org.junit.Before
import org.junit.Rule
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import android.content.pm.ActivityInfo
Expand All @@ -12,7 +12,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_bs.*
import kotlinx.android.synthetic.main.activity_mock_defaults_rs.*
import kotlinx.android.synthetic.main.activity_mock_defaults_ses.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_ses.*
import org.hamcrest.Matchers.not
import org.junit.Before
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_attributes_ss.*
import kotlinx.android.synthetic.main.activity_mock_defaults_ses.*
import org.junit.Before
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import android.content.pm.ActivityInfo
Expand All @@ -12,7 +12,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_bs.*
import kotlinx.android.synthetic.main.activity_mock_defaults_rs.*
import kotlinx.android.synthetic.main.activity_mock_defaults_ses.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Intent
import androidx.test.espresso.Espresso.onView
Expand All @@ -7,7 +7,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.*
import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import com.awolity.settingsviews.TextColorMatcher.withTextColor
import com.awolity.settingviews.TextColorMatcher.withTextColor
import kotlinx.android.synthetic.main.activity_mock_defaults_ss.*
import org.hamcrest.Matchers.not
import org.junit.Before
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

package com.awolity.settingsviews;
package com.awolity.settingviews;

import android.content.res.Resources;
import android.view.View;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.awolity.settingsviews">
package="com.awolity.settingviews">

<application>
<activity android:name="com.awolity.settingsviews.MockActivity"
<activity android:name="com.awolity.settingviews.MockActivity"
android:theme="@style/AppTheme" >
</activity>
</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.animation.Animator
import android.content.Context
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Context
import android.content.res.TypedArray
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Context
import android.content.res.TypedArray
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.os.Parcel
import android.os.Parcelable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.awolity.settingsviews
package com.awolity.settingviews

import android.content.Context
import android.content.res.TypedArray
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.awolity.settingsviews.ButtonSetting
<com.awolity.settingviews.ButtonSetting
android:id="@+id/bs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.awolity.settingsviews.RadiogroupSetting
<com.awolity.settingviews.RadiogroupSetting
android:id="@+id/rs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.awolity.settingsviews.SeekbarSetting
<com.awolity.settingviews.SeekbarSetting
android:id="@+id/ses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.awolity.settingsviews.SwitchSetting
<com.awolity.settingviews.SwitchSetting
android:id="@+id/ss"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.awolity.settingsviews.ButtonSetting
<com.awolity.settingviews.ButtonSetting
android:id="@+id/bs"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
Expand Down
Loading

0 comments on commit 942ca7d

Please sign in to comment.