sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

first control / layout design

Browse source
This commit is contained in:
Negue 2017-03-28 22:53:28 +02:00
parent b20e14e022
commit 57e9dd9272
5 changed files with 132 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Habitica/AndroidManifest.xml
View file

@ -140,6 +140,16 @@
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.activities.MainActivity" />
</activity>
<activity
android:name=".ui.activities.CreateChallengeActivity"
android:parentActivityName=".ui.activities.MainActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask"
tools:ignore="UnusedAttribute">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.activities.MainActivity" />
</activity>
<activity android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"

180
Habitica/res/layout/activity_create_challenge.xml
View file

@ -7,96 +7,148 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.habitrpg.android.habitica.ui.activities.CreateChallengeActivity">
<android.support.design.widget.TextInputLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin">
<EditText
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="New challenge title" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
android:textColorHint="@color/brand_500"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<EditText
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="New challenge title" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Description" />
</android.support.design.widget.TextInputLayout>
<TextView
app:hintTextAppearance="@style/TextAppearance.AppCompat">
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Description"
android:inputType="textMultiLine"
android:minLines="3"
android:maxLines="5"
/>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Gem reward" />
android:layout_height="2dp"
android:background="@color/brand_700"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="+"/>
android:text="Gem reward"
style="@style/Body1"/>
<EditText
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/plus"
android:drawableTint="@color/brand_500"
style="@style/Body1_Button"
android:layout_weight="1"
android:id="@+id/challenge_add_gem_btn"/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2"
android:inputType="number"
android:gravity="center"
android:textAlignment="center"
android:drawableLeft="@drawable/ic_header_gem"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableRight="@drawable/minus"
android:drawableTint="@color/brand_500"
style="@style/Body1_Button"
android:id="@+id/challenge_remove_gem_btn" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Location"
style="@style/Body1" />
<Spinner
android:id="@+id/challenge_location_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="-"/>
android:text="Tag"
style="@style/Body1" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Tasks"
style="@style/Body1" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Habit" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Daily" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add To-Do" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Reward" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Location" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Tag" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Tasks" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Habit" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Daily" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add To-Do" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Add Reward" />
</LinearLayout>

5
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
View file

@ -5,6 +5,7 @@ import com.facebook.FacebookSdk;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.habitrpg.android.habitica.components.AppComponent;
import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
import com.habitrpg.android.habitica.ui.activities.CreateChallengeActivity;
import com.habitrpg.android.habitica.ui.activities.IntroActivity;
import com.habitrpg.android.habitica.ui.activities.LoginActivity;
import com.habitrpg.android.habitica.ui.activities.SetupActivity;
@ -110,7 +111,9 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
}
public static boolean checkUserAuthentication(Context context, HostConfig hostConfig) {
startActivity(SetupActivity.class, context);
startActivity(CreateChallengeActivity.class, context);
if (hostConfig == null || hostConfig.getApi() == null || hostConfig.getApi().equals("") || hostConfig.getUser() == null || hostConfig.getUser().equals("")) {
startActivity(IntroActivity.class, context);

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java
View file

@ -9,7 +9,7 @@ public class CreateChallengeActivity extends BaseActivity {
@Override
protected int getLayoutResId() {
return R.id.activity_create_challenge;
return R.layout.activity_create_challenge;
}
@Override

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -276,6 +276,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
}
EventBus.getDefault().register(this);
}
@Override