Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Krishna Vemulavada
/
vera_2.1_app
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
f20b943c
authored
Aug 29, 2016
by
Kunj Gupta
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
UOFLMA-27: Dynamic form page is created.
parent
0161f043
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
125 additions
and
11 deletions
app/src/main/java/com/vsoft/uofl_catalogue/ui/CatalogueItemScreen.java
app/src/main/java/com/vsoft/uofl_catalogue/ui/CatalogueVariableScreen.java
app/src/main/res/drawable/back_button_bg_with_border.xml
app/src/main/res/drawable/background_with_border.xml → app/src/main/res/drawable/list_view_item_bg_with_border.xml
app/src/main/res/drawable/submit_button_bg_with_border.xml
app/src/main/res/layout/catalogue_category_adapter.xml
app/src/main/res/layout/catalogue_category_item_adapter.xml
app/src/main/res/layout/catalogue_variable_screen.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/dimen.xml
app/src/main/res/values/ids.xml
app/src/main/res/values/strings.xml
app/src/main/java/com/vsoft/uofl_catalogue/ui/CatalogueItemScreen.java
View file @
f20b943c
...
@@ -139,6 +139,7 @@ public class CatalogueItemScreen extends AppCompatActivity {
...
@@ -139,6 +139,7 @@ public class CatalogueItemScreen extends AppCompatActivity {
Intent
intent
=
new
Intent
(
CatalogueItemScreen
.
this
,
CatalogueVariableScreen
.
class
);
Intent
intent
=
new
Intent
(
CatalogueItemScreen
.
this
,
CatalogueVariableScreen
.
class
);
intent
.
putExtra
(
Constants
.
DATA_KEY_SYS_ID
,
mCatalogueItemList
.
get
(
position
).
getSysId
());
intent
.
putExtra
(
Constants
.
DATA_KEY_SYS_ID
,
mCatalogueItemList
.
get
(
position
).
getSysId
());
intent
.
putExtra
(
Constants
.
DATA_KEY_CATALOGUE_ITEM_DESCRIPTION
,
mCatalogueItemList
.
get
(
position
).
getDescription
());
intent
.
putExtra
(
Constants
.
DATA_KEY_CATALOGUE_ITEM_DESCRIPTION
,
mCatalogueItemList
.
get
(
position
).
getDescription
());
intent
.
putExtra
(
Constants
.
DATA_KEY_CATALOGUE_TITLE
,
mCatalogueItemList
.
get
(
position
).
getName
());
startActivity
(
intent
);
startActivity
(
intent
);
}
}
});
});
...
...
app/src/main/java/com/vsoft/uofl_catalogue/ui/CatalogueVariableScreen.java
View file @
f20b943c
This diff is collapsed.
Click to expand it.
app/src/main/res/drawable/back_button_bg_with_border.xml
0 → 100644
View file @
f20b943c
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"5dp"
/>
<solid
android:color=
"@color/back_button_bg_color"
/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/
background
_with_border.xml
→
app/src/main/res/drawable/
list_view_item_bg
_with_border.xml
View file @
f20b943c
File moved
app/src/main/res/drawable/submit_button_bg_with_border.xml
0 → 100644
View file @
f20b943c
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<corners
android:radius=
"5dp"
/>
<solid
android:color=
"@color/submit_button_bg_color"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/catalogue_category_adapter.xml
View file @
f20b943c
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
android:weightSum=
"10"
android:weightSum=
"10"
android:paddingLeft=
"@dimen/small_margin"
android:paddingLeft=
"@dimen/small_margin"
android:paddingRight=
"@dimen/small_margin"
android:paddingRight=
"@dimen/small_margin"
android:background=
"@drawable/
background
_with_border"
>
android:background=
"@drawable/
list_view_item_bg
_with_border"
>
<ImageView
<ImageView
android:layout_width=
"0dp"
android:layout_width=
"0dp"
...
...
app/src/main/res/layout/catalogue_category_item_adapter.xml
View file @
f20b943c
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
android:weightSum=
"10"
android:weightSum=
"10"
android:paddingLeft=
"@dimen/small_margin"
android:paddingLeft=
"@dimen/small_margin"
android:paddingRight=
"@dimen/small_margin"
android:paddingRight=
"@dimen/small_margin"
android:background=
"@drawable/
background
_with_border"
>
android:background=
"@drawable/
list_view_item_bg
_with_border"
>
<ImageView
<ImageView
android:layout_width=
"0dp"
android:layout_width=
"0dp"
...
...
app/src/main/res/layout/catalogue_variable_screen.xml
0 → 100644
View file @
f20b943c
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
android:weightSum=
"10"
>
<android.support.v7.widget.Toolbar
android:id=
"@+id/tool_bar_view"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_margin=
"0dp"
android:background=
"@android:color/white"
android:contentInsetEnd=
"0dp"
android:contentInsetRight=
"0dp"
android:contentInsetStart=
"0dp"
android:minHeight=
"?attr/actionBarSize"
android:padding=
"0dp"
app:contentInsetEnd=
"0dp"
app:contentInsetLeft=
"0dp"
app:contentInsetRight=
"0dp"
app:contentInsetStart=
"0dp"
/>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<TextView
android:id=
"@+id/variable_screen_empty_text_view"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:text=
"@string/no_variables_string"
android:textSize=
"@dimen/extra_normal_text_size"
/>
<LinearLayout
android:id=
"@+id/variable_screen_main_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/screen_bg_color"
android:orientation=
"vertical"
android:padding=
"@dimen/normal_margin"
android:visibility=
"gone"
>
<ScrollView
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"9"
android:background=
"@android:color/white"
android:requiresFadingEdge=
"vertical"
>
<LinearLayout
android:id=
"@+id/variable_screen_container_layout"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@android:color/white"
android:orientation=
"vertical"
android:padding=
"@dimen/normal_margin"
/>
</ScrollView>
<RelativeLayout
android:id=
"@+id/variable_screen_bottom_layout"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:background=
"@android:color/white"
android:gravity=
"center_vertical"
>
<TextView
android:id=
"@+id/variable_screen_submit_text_view"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"@dimen/normal_margin"
android:background=
"@drawable/submit_button_bg_with_border"
android:paddingBottom=
"@dimen/normal_margin"
android:paddingLeft=
"@dimen/extra_large_margin"
android:paddingRight=
"@dimen/extra_large_margin"
android:paddingTop=
"@dimen/normal_margin"
android:text=
"@string/submit_string"
android:textColor=
"@android:color/white"
/>
<TextView
android:id=
"@+id/variable_screen_back_text_view"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/normal_margin"
android:layout_toLeftOf=
"@id/variable_screen_submit_text_view"
android:background=
"@drawable/back_button_bg_with_border"
android:paddingBottom=
"@dimen/normal_margin"
android:paddingLeft=
"@dimen/extra_large_margin"
android:paddingRight=
"@dimen/extra_large_margin"
android:paddingTop=
"@dimen/normal_margin"
android:text=
"@string/back_string"
android:textColor=
"@android:color/white"
/>
</RelativeLayout>
</LinearLayout>
</FrameLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @
f20b943c
...
@@ -14,4 +14,7 @@
...
@@ -14,4 +14,7 @@
<color
name=
"screen_bg_color"
>
#c0cfd1
</color>
<color
name=
"screen_bg_color"
>
#c0cfd1
</color>
<color
name=
"bg_border_color"
>
#d6d6d6
</color>
<color
name=
"bg_border_color"
>
#d6d6d6
</color>
<color
name=
"back_button_bg_color"
>
#4f0307
</color>
<color
name=
"submit_button_bg_color"
>
#e31b22
</color>
</resources>
</resources>
app/src/main/res/values/dimen.xml
View file @
f20b943c
...
@@ -12,10 +12,8 @@
...
@@ -12,10 +12,8 @@
<dimen
name=
"extra_normal_text_size"
>
18sp
</dimen>
<dimen
name=
"extra_normal_text_size"
>
18sp
</dimen>
<dimen
name=
"large_text_size"
>
20sp
</dimen>
<dimen
name=
"large_text_size"
>
20sp
</dimen>
<dimen
name=
"separator_value"
>
1dp
</dimen>
<dimen
name=
"list_view_divider_height"
>
5dp
</dimen>
<dimen
name=
"list_view_divider_height"
>
5dp
</dimen>
<!--Home Screen-->
<!--Home Screen-->
<dimen
name=
"home_screen_item_height"
>
120dp
</dimen>
<dimen
name=
"home_screen_item_height"
>
120dp
</dimen>
...
...
app/src/main/res/values/ids.xml
deleted
100644 → 0
View file @
0161f043
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item
name=
"create_form_save_text_view"
type=
"id"
/>
<item
name=
"create_form_cancel_text_view"
type=
"id"
/>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
f20b943c
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
<string
name=
"app_name"
>
UofL Catalogue
</string>
<string
name=
"app_name"
>
UofL Catalogue
</string>
<string
name=
"set_string"
>
Set
</string>
<string
name=
"set_string"
>
Set
</string>
<string
name=
"save_string"
>
Save
</string>
<string
name=
"submit_string"
>
Submit
</string>
<string
name=
"back_string"
>
Back
</string>
<string
name=
"error_string"
>
* Required
</string>
<string
name=
"error_string"
>
* Required
</string>
<string
name=
"none_string"
>
-None-
</string>
<string
name=
"none_string"
>
-None-
</string>
<string
name=
"search_for_reference_string"
>
Reference
</string>
<string
name=
"search_for_reference_string"
>
Reference
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment